diff options
| author | trav90 <travawine@openmailbox.org> | 2018-02-04 13:19:22 -0600 |
|---|---|---|
| committer | trav90 <travawine@openmailbox.org> | 2018-02-04 13:19:22 -0600 |
| commit | 30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2 (patch) | |
| tree | a6031d45b30f0b5b66e2b1774d75b0f953a2aedc /media/ffvpx/libavcodec/parser.c | |
| parent | fc7d9fade54dfbe275c4808dabe30a19415082e0 (diff) | |
| download | UXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.tar UXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.tar.gz UXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.tar.lz UXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.tar.xz UXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.zip | |
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 */ |