ffmpeg | branch: master | Carl Eugen Hoyos <ceho...@ag.or.at> | Sun Aug 10 22:31:33 2014 +0200| [788cf6f0c60739653a1ded8d1fd79a805a16d530] | committer: Carl Eugen Hoyos
Remove panscan information in av_frame_copy_props() if resolution changes. Fixes ticket #3750. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=788cf6f0c60739653a1ded8d1fd79a805a16d530 --- libavutil/frame.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 67a7d3e..12eac55 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -492,7 +492,11 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src) for (i = 0; i < src->nb_side_data; i++) { const AVFrameSideData *sd_src = src->side_data[i]; - AVFrameSideData *sd_dst = av_frame_new_side_data(dst, sd_src->type, + AVFrameSideData *sd_dst; + if ( sd_src->type == AV_FRAME_DATA_PANSCAN + && (src->width != dst->width || src->height != dst->height)) + continue; + sd_dst = av_frame_new_side_data(dst, sd_src->type, sd_src->size); if (!sd_dst) { for (i = 0; i < dst->nb_side_data; i++) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
