diff mbox

[FFmpeg-devel,1/4] lavc/parser: export field order if not already set

Message ID 20161004044939.22351-1-rodger.combs@gmail.com
State Accepted
Headers show

Commit Message

Rodger Combs Oct. 4, 2016, 4:49 a.m. UTC 
Some codecs set this in the parser, but not the decoder
---
 libavcodec/parser.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Michael Niedermayer Oct. 5, 2016, 11:19 a.m. UTC | #1 
On Mon, Oct 03, 2016 at 11:49:36PM -0500, Rodger Combs wrote:
> Some codecs set this in the parser, but not the decoder
> ---
>  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);
> +    }

LGTM

thx

[...]
diff mbox

Patch

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 */