[FFmpeg-cvslog] lavc/rawdec: set field order on decoded frame.
Nicolas George
git at videolan.org
Sun Mar 10 02:03:01 CET 2013
ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Sat Mar 9 20:21:10 2013 +0100| [9cc02101ff6de45d48425fa23978643e1b760626] | committer: Michael Niedermayer
lavc/rawdec: set field order on decoded frame.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9cc02101ff6de45d48425fa23978643e1b760626
---
libavcodec/rawdec.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index 01ecf78..efd8020 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -147,12 +147,6 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx)
avctx->codec_tag == MKTAG('W','R','A','W'))
context->flip = 1;
- if (avctx->field_order > AV_FIELD_PROGRESSIVE) { /*we have interlaced material flagged in container */
- avctx->coded_frame->interlaced_frame = 1;
- if (avctx->field_order == AV_FIELD_TT || avctx->field_order == AV_FIELD_TB)
- avctx->coded_frame->top_field_first = 1;
- }
-
if (avctx->codec_tag == AV_RL32("yuv2") &&
avctx->pix_fmt == AV_PIX_FMT_YUYV422)
context->is_yuv2 = 1;
@@ -325,6 +319,12 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
}
}
+ if (avctx->field_order > AV_FIELD_PROGRESSIVE) { /* we have interlaced material flagged in container */
+ frame->interlaced_frame = 1;
+ if (avctx->field_order == AV_FIELD_TT || avctx->field_order == AV_FIELD_TB)
+ frame->top_field_first = 1;
+ }
+
*got_frame = 1;
return buf_size;
}
More information about the ffmpeg-cvslog
mailing list