FFmpeg/libavcodec
Michael Niedermayer 07a79cf869 Merge commit '7a4f74eed51f914e9bbfebaffd4a92ac6791f819'
* commit '7a4f74eed51f914e9bbfebaffd4a92ac6791f819':
  h264: embed the DPB in the context

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29 15:33:46 +02:00
..
2015-04-22 17:45:51 +02:00
2015-04-28 00:04:58 +02:00
2015-04-28 00:04:58 +02:00
2015-04-28 00:04:58 +02:00
2015-04-28 00:04:58 +02:00
2015-04-24 00:00:20 -07:00
2015-04-24 00:00:12 -07:00
2015-04-20 14:36:41 +02:00
2015-04-24 16:54:31 +02:00