[FFmpeg-cvslog] Merge commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 27 02:42:30 2014 +0200| [01831fd004908f9dbc3777400169505a63a7adef] | committer: Michael Niedermayer

Merge commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2'

* commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2':
  hwaccel: Call ->get_format again if hwaccel init fails

Conflicts:
	libavcodec/utils.c

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

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