FFmpeg/libavcodec
Michael Niedermayer 830e548b9e Merge commit '582683b6ac798ed2a004a4e2121b7bd47892bbfd'
* commit '582683b6ac798ed2a004a4e2121b7bd47892bbfd':
  h264: move remaining ER stuff into the per-slice context

Conflicts:
	libavcodec/h264.h
	libavcodec/h264_picture.c
	libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21 20:00:34 +01:00
..
2015-03-06 14:37:44 +01:00
2015-03-20 02:38:20 -03:00
2015-03-10 23:33:57 +01:00
2015-03-03 13:57:42 +01:00
2015-03-03 13:57:42 +01:00
2015-02-21 20:41:36 +01:00
2015-02-21 20:38:13 +01:00
2015-03-20 00:25:50 +01:00
2015-03-14 14:05:25 +01:00
2015-03-02 19:32:23 +01:00
2015-02-27 09:30:13 +00:00
2015-03-20 02:17:31 +01:00
2015-02-18 10:21:56 -05:00
2015-03-20 00:25:50 +01:00
2015-02-24 03:15:42 +01:00
2015-03-16 13:04:47 +01:00
2015-03-15 02:57:24 +01:00