diff mbox

[FFmpeg-devel,1/2] vc1: Return stream format information from parser

Message ID c6b4e700-14be-5154-9f12-45d7df307ac0@jkqxz.net
State Superseded
Headers show

Commit Message

Mark Thompson Oct. 23, 2016, 5:56 p.m. UTC 
---
This is required by the vc1_qsv decoder in the following patch.

 libavcodec/vc1_parser.c | 8 ++++++++
 1 file changed, 8 insertions(+)
diff mbox

Patch

diff --git a/libavcodec/vc1_parser.c b/libavcodec/vc1_parser.c
index 9ca6154..bb54947 100644
--- a/libavcodec/vc1_parser.c
+++ b/libavcodec/vc1_parser.c
@@ -115,6 +115,14 @@  static void vc1_extract_header(AVCodecParserContext *s, AVCodecContext *avctx,
     }
     if (avctx->framerate.num)
         avctx->time_base = av_inv_q(av_mul_q(avctx->framerate, (AVRational){avctx->ticks_per_frame, 1}));
+    s->format = vpc->v.chromaformat == 1 ? AV_PIX_FMT_YUV420P
+                                         : AV_PIX_FMT_NONE;
+    if (avctx->width && avctx->height) {
+        s->width        = avctx->width;
+        s->height       = avctx->height;
+        s->coded_width  = FFALIGN(avctx->coded_width,  16);
+        s->coded_height = FFALIGN(avctx->coded_height, 16);
+    }
 }

 static int vc1_parse(AVCodecParserContext *s,