FFmpeg/libavcodec
Michael Niedermayer e9d646f44c Merge commit '0181ae9af2de1526464d23209b82e6674d362f5d'
* commit '0181ae9af2de1526464d23209b82e6674d362f5d':
  h264: Make sure reinit failures mark the context as not initialized

Conflicts:
	libavcodec/h264_slice.c

See: e8714f6f93d1a32f4e4655209960afcf4c185214
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-30 21:33:00 +02:00
..
2015-05-13 01:59:51 +02:00
2015-05-28 16:10:56 +02:00
2015-05-28 01:01:16 +02:00
2015-05-26 05:23:29 +02:00
2015-05-25 16:08:08 +02:00
2015-05-20 15:50:58 +02:00
2015-05-26 18:36:13 -07:00
2015-05-13 00:41:38 +02:00