falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

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@gmx.at>
tags/n2.0
Michael Niedermayer 12 years ago
parent
aa6454e6ca ffba2053ed
commit
5692ad00f4
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available