[FFmpeg-cvslog] Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 23 14:26:27 2013 +0100| [62e10c375968d9cbbe2a0bc321e00eef52d32917] | committer: Michael Niedermayer

Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'

* commit '07fd0a22192805d56c635eb294dc26b0a54ae325':
  avconv: add infrastructure for using hwaccels

Conflicts:
	ffmpeg.c
	ffmpeg.h
	ffmpeg_filter.c
	ffmpeg_opt.c

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

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