Michael Niedermayer 01831fd004 Merge commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2' ...

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

Conflicts:
	libavcodec/utils.c

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

2014-09-27 02:42:30 +02:00

120 KiB

Raw Blame History

View Raw