[FFmpeg-cvslog] Merge commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 12 15:19:32 2013 +0200| [7b6c0bda9e94a9214445f83a4a469110b235dbde] | committer: Michael Niedermayer

Merge commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb'

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

Conflicts:
	ffmpeg_filter.c

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

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