[FFmpeg-cvslog] ffmpeg.c: check for interlaced flag in the correct place.
Anton Khirnov
git at videolan.org
Mon May 9 04:48:12 CEST 2011
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Fri May 6 17:59:15 2011 +0200| [648e55ff1beea72b53f8fb231b3ef0fb16cd3e62] | committer: Anton Khirnov
ffmpeg.c: check for interlaced flag in the correct place.
In the corresponding codec context, not global options storage.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=648e55ff1beea72b53f8fb231b3ef0fb16cd3e62
---
ffmpeg.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index c586811..2540a2e 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1186,7 +1186,7 @@ static void do_video_out(AVFormatContext *s,
/* better than nothing: use input picture interlaced
settings */
big_picture.interlaced_frame = in_picture->interlaced_frame;
- if(avcodec_opts[AVMEDIA_TYPE_VIDEO]->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME)){
+ if (ost->st->codec->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME)) {
if(top_field_first == -1)
big_picture.top_field_first = in_picture->top_field_first;
else
More information about the ffmpeg-cvslog
mailing list