Merge commit 'c5fcdb440237f06f6c954185ab60970cabf786a2'

[ffmpeg] / libavcodec / adx_parser.c

diff --git a/libavcodec/adx_parser.c b/libavcodec/adx_parser.c
index de3b1b073f521d53a5b8a8cb8fa84912def8f9fb..706e242c8292e3c2b104efa623296a3775124a31 100644 (file)
--- a/libavcodec/adx_parser.c
+++ b/libavcodec/adx_parser.c
@@ -80,13 +80,16 @@ static int adx_parse(AVCodecParserContext *s1,
         *poutbuf_size = 0;
         return buf_size;
     }
+
+    s1->duration = BLOCK_SAMPLES;
+
     *poutbuf = buf;
     *poutbuf_size = buf_size;
     return next;
 }
 
 AVCodecParser ff_adx_parser = {
-    .codec_ids      = { CODEC_ID_ADPCM_ADX },
+    .codec_ids      = { AV_CODEC_ID_ADPCM_ADX },
     .priv_data_size = sizeof(ADXParseContext),
     .parser_parse   = adx_parse,
     .parser_close   = ff_parse_close,