frmdec: tag 2 is AV_PIX_FMT_RGB0

[ffmpeg] / libavformat / adxdec.c

diff --git a/libavformat/adxdec.c b/libavformat/adxdec.c
index dca9748301f49118803b96173bf21d62d489fb3b..49e19307d5024db27bc767b41af2471aec007146 100644 (file)
--- a/libavformat/adxdec.c
+++ b/libavformat/adxdec.c
@@ -62,7 +62,7 @@ static int adx_read_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-static int adx_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int adx_read_header(AVFormatContext *s)
 {
     ADXDemuxerContext *c = s->priv_data;
     AVCodecContext *avctx;
@@ -94,7 +94,7 @@ static int adx_read_header(AVFormatContext *s, AVFormatParameters *ap)
         return ret;
 
     st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
-    st->codec->codec_id    = s->iformat->value;
+    st->codec->codec_id    = s->iformat->raw_codec_id;
 
     avpriv_set_pts_info(st, 64, BLOCK_SAMPLES, avctx->sample_rate);
 
@@ -108,5 +108,6 @@ AVInputFormat ff_adx_demuxer = {
     .read_header    = adx_read_header,
     .read_packet    = adx_read_packet,
     .extensions     = "adx",
-    .value          = CODEC_ID_ADPCM_ADX,
+    .raw_codec_id   = AV_CODEC_ID_ADPCM_ADX,
+    .flags          = AVFMT_GENERIC_INDEX,
 };