matroskadec: remove now useless vstream and is_video_key_frame

[ffmpeg] / libavformat / apc.c

diff --git a/libavformat/apc.c b/libavformat/apc.c
index 94ee28072ec8d88f58327edf37ed8d63066af7ac..20de1c7e589534b70d60599e4dfe890bc7c4a110 100644 (file)
--- a/libavformat/apc.c
+++ b/libavformat/apc.c
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <string.h>
 #include "avformat.h"
-#include "string.h"
 
 static int apc_probe(AVProbeData *p)
 {
@@ -32,7 +32,7 @@ static int apc_probe(AVProbeData *p)
 
 static int apc_read_header(AVFormatContext *s, AVFormatParameters *ap)
 {
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     AVStream *st;
 
     get_le32(pb); /* CRYO */
@@ -41,7 +41,7 @@ static int apc_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
     st = av_new_stream(s, 0);
     if (!st)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
 
     st->codec->codec_type = CODEC_TYPE_AUDIO;
     st->codec->codec_id = CODEC_ID_ADPCM_IMA_WS;
@@ -53,7 +53,7 @@ static int apc_read_header(AVFormatContext *s, AVFormatParameters *ap)
     st->codec->extradata = av_malloc(st->codec->extradata_size +
                                      FF_INPUT_BUFFER_PADDING_SIZE);
     if (!st->codec->extradata)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
 
     /* initial predictor values for adpcm decoder */
     get_buffer(pb, st->codec->extradata, 2 * 4);
@@ -74,15 +74,15 @@ static int apc_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
 static int apc_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
-    if (av_get_packet(&s->pb, pkt, MAX_READ_SIZE) <= 0)
-        return AVERROR_IO;
+    if (av_get_packet(s->pb, pkt, MAX_READ_SIZE) <= 0)
+        return AVERROR(EIO);
     pkt->stream_index = 0;
     return 0;
 }
 
 AVInputFormat apc_demuxer = {
     "apc",
-    "CRYO APC format",
+    NULL_IF_CONFIG_SMALL("CRYO APC format"),
     0,
     apc_probe,
     apc_read_header,