From 60de7616575cfea3e01bb19ff476a97a8ab8da3b Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 31 May 2012 12:29:07 +0200 Subject: ffmpeg: allow overriding input top field first Signed-off-by: Michael Niedermayer --- ffmpeg.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index a97327b65b..849bd708fe 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -237,6 +237,7 @@ typedef struct InputStream { int showed_multi_packet_warning; AVDictionary *opts; AVRational framerate; /* framerate forced with -r */ + int top_field_first; int resample_height; int resample_width; @@ -2574,6 +2575,9 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output) return ret; } + if(ist->top_field_first>=0) + decoded_frame->top_field_first = ist->top_field_first; + best_effort_timestamp= av_frame_get_best_effort_timestamp(decoded_frame); if(best_effort_timestamp != AV_NOPTS_VALUE) ist->next_pts = ist->pts = av_rescale_q(decoded_frame->pts = best_effort_timestamp, ist->st->time_base, AV_TIME_BASE_Q); @@ -4082,6 +4086,9 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) exit_program(1); } + ist->top_field_first = -1; + MATCH_PER_STREAM_OPT(top_field_first, i, ist->top_field_first, ic, st); + break; case AVMEDIA_TYPE_AUDIO: guess_input_channel_layout(ist); -- cgit v1.2.3