Merge commit '4cfbeef31d4e6096c0596359d212f5d99a7ba4b5'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Dec 2014 11:15:34 +0000 (12:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Dec 2014 11:15:34 +0000 (12:15 +0100)
commit57089084ba7ece20889b8196f68ad9b08e8db8ba
tree5b2553a183a4da7485519e38c861b0a3e87c47af
parentfa0e5ffb89b14ac9dbccd23dd50b8dcb64b75282
parent4cfbeef31d4e6096c0596359d212f5d99a7ba4b5
Merge commit '4cfbeef31d4e6096c0596359d212f5d99a7ba4b5'

* commit '4cfbeef31d4e6096c0596359d212f5d99a7ba4b5':
  h264: factor hwaccel pixel formats list

Conflicts:
libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_slice.c