Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Nov 2013 13:26:27 +0000 (14:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Nov 2013 13:31:15 +0000 (14:31 +0100)
commit62e10c375968d9cbbe2a0bc321e00eef52d32917
tree8c8a3a4b025d3cf54abb44a3ab988c58c2c9e615
parent94194bdcd7bfc2137ccd13e5c149567b9a917f4f
parent07fd0a22192805d56c635eb294dc26b0a54ae325
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@gmx.at>
doc/ffmpeg.texi
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c