[FFmpeg-cvslog] Merge commit 'ffba2053edfc177d217bf4a95edf51cd0fc40753'

Michael Niedermayer git at videolan.org
Wed May 15 10:38:45 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 15 10:31:30 2013 +0200| [5692ad00f4881891c67a92bbf2ccc0c601fa3705] | committer: Michael Niedermayer

Merge commit 'ffba2053edfc177d217bf4a95edf51cd0fc40753'

* commit 'ffba2053edfc177d217bf4a95edf51cd0fc40753':
  lavfi: fix compatibility code for old vf_scale options syntax

Conflicts:
	libavfilter/avfilter.c

No change as the buggy code does not exist in FFmpeg

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5692ad00f4881891c67a92bbf2ccc0c601fa3705
---





More information about the ffmpeg-cvslog mailing list