-
Michael Niedermayer authored
* commit 'bee2d75b': avconv: update to the new options syntax. Conflicts: ffmpeg_filter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
7b6c0bda
* commit 'bee2d75b': avconv: update to the new options syntax. Conflicts: ffmpeg_filter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>