[FFmpeg-cvslog] lavc/parser: export field order if not already set

Rodger Combs git at videolan.org
Mon Oct 24 09:50:14 EEST 2016


ffmpeg | branch: master | Rodger Combs <rodger.combs at gmail.com> | Tue Sep 20 05:57:39 2016 -0500| [d13740f3a207668f53ce167cf96f353379ac2c14] | committer: Rodger Combs

lavc/parser: export field order if not already set

Some codecs set this in the parser, but not the decoder

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d13740f3a207668f53ce167cf96f353379ac2c14
---

 libavcodec/parser.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 2c8fc69..30cfc55 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -182,6 +182,11 @@ int av_parser_parse2(AVCodecParserContext *s, AVCodecContext *avctx,
     index = s->parser->parser_parse(s, avctx, (const uint8_t **) poutbuf,
                                     poutbuf_size, buf, buf_size);
     av_assert0(index > -0x20000000); // The API does not allow returning AVERROR codes
+#define FILL(name) if(s->name > 0 && avctx->name <= 0) avctx->name = s->name
+    if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
+        FILL(field_order);
+    }
+
     /* update the file pointer */
     if (*poutbuf_size) {
         /* fill the data for the current frame */



More information about the ffmpeg-cvslog mailing list