From cc80caff52a3a20d2ef4285d06263e542e3ddf46 Mon Sep 17 00:00:00 2001 From: "S.N. Hemanth Meenakshisundaram" Date: Wed, 11 Aug 2010 11:06:04 +0000 Subject: Separate video specific BufferRef properties into VideoProps. Define a new struct AVFilterBufferRefVideoProps and add a type field to AVFilterBufferRef. Video specific properties in AVFilterBufferRefVideoProps are now referred to by *video pointer in AVFilterBufferRef. Patch by S.N. Hemanth Meenakshisundaram smeenaks->ucsd.edu. Originally committed as revision 24763 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index aec1f79caf..501732ecfc 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -377,8 +377,8 @@ static int get_filtered_video_pic(AVFilterContext *ctx, memcpy(pic2->data, pic->data, sizeof(pic->data)); memcpy(pic2->linesize, pic->linesize, sizeof(pic->linesize)); - pic2->interlaced_frame = pic->interlaced; - pic2->top_field_first = pic->top_field_first; + pic2->interlaced_frame = pic->video->interlaced; + pic2->top_field_first = pic->video->top_field_first; return 1; } @@ -1701,7 +1701,8 @@ static int output_packet(AVInputStream *ist, int ist_index, break; case AVMEDIA_TYPE_VIDEO: #if CONFIG_AVFILTER - ost->st->codec->sample_aspect_ratio = ist->picref->pixel_aspect; + if (ist->picref->video) + ost->st->codec->sample_aspect_ratio = ist->picref->video->pixel_aspect; #endif do_video_out(os, ost, ist, &picture, &frame_size); if (vstats_filename && frame_size) -- cgit v1.2.3