diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 10:31:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 10:38:11 +0200 |
| commit | 5692ad00f4881891c67a92bbf2ccc0c601fa3705 (patch) | |
| tree | 3082aeec21d0683891220d99169d81f018f5df41 /libavdevice/x11grab.c | |
| parent | aa6454e6ca7bb898e9fb1990bbcc821caf4ad51a (diff) | |
| parent | ffba2053edfc177d217bf4a95edf51cd0fc40753 (diff) | |
| download | ffmpeg-5692ad00f4881891c67a92bbf2ccc0c601fa3705.tar.gz | |
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>
Diffstat (limited to 'libavdevice/x11grab.c')
0 files changed, 0 insertions, 0 deletions