diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-02-06 12:03:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 12:03:37 +0100 |
| commit | 5cc30e0f603a030b97b7be37a7aa5d22d13f7a07 (patch) | |
| tree | 01875b465e2f7749cc8f87f1df756b2cb2ca2596 /media/ffvpx/libavcodec/parser.c | |
| parent | 389c60da5e01761f4a11ef539ffa26e4c1b17875 (diff) | |
| parent | 30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2 (diff) | |
| download | UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar.gz UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar.lz UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar.xz UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.zip | |
Merge pull request #10 from trav90/media-work
Update FFmpeg code to n3.2-65-gee56777
Diffstat (limited to 'media/ffvpx/libavcodec/parser.c')
| -rw-r--r-- | media/ffvpx/libavcodec/parser.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/ffvpx/libavcodec/parser.c b/media/ffvpx/libavcodec/parser.c index 2c8fc6904..30cfc55cb 100644 --- a/media/ffvpx/libavcodec/parser.c +++ b/media/ffvpx/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 */ |