Merge commit '582683b6ac798ed2a004a4e2121b7bd47892bbfd'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 19:00:34 +0000 (20:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 19:00:34 +0000 (20:00 +0100)
commit830e548b9ec32ad7ab02be056db15cbcf3c58346
tree03ce45e4c52217252ae2fb8f960d75cd4f23d51c
parent44309dd29466bf2d9d9fa26ab6e73e7e64989c75
parent582683b6ac798ed2a004a4e2121b7bd47892bbfd
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>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_picture.c
libavcodec/h264_slice.c