Merge commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Apr 2013 13:19:32 +0000 (15:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Apr 2013 13:19:32 +0000 (15:19 +0200)
commit7b6c0bda9e94a9214445f83a4a469110b235dbde
tree4fd265135b63d1eb69922e955ee5719a9c1c7d1e
parent9a91c67478cd46d8c43774f8e1876d90323432d3
parentbee2d75b66e2f02e0877796c01202299a4b56cfb
Merge commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb'

* commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb':
  avconv: update to the new options syntax.

Conflicts:
ffmpeg_filter.c

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