Merge commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Sep 2014 00:42:30 +0000 (02:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Sep 2014 00:42:30 +0000 (02:42 +0200)
commit01831fd004908f9dbc3777400169505a63a7adef
tree26be552bd1dced251a55dbcf81d3fb95f30e4273
parenteb1ac04e59cbba7743c10dd5854b6efdfb6a2ebe
parent1c80c9d7ef809180042257200c7b5f6b81d0b0e2
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>
libavcodec/avcodec.h
libavcodec/utils.c