Merge commit 'f42485dbce614b3f63182845da43db690b427b7c'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:13:24 +0000 (17:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:13:24 +0000 (17:13 +0100)
commit55215383dc04365935c86f8a4db7b5396f1e3541
tree416380f73859591236b30e05a5213f66525c6822
parent727b202330712eb981eb008b1e7a936d71092f71
parentf42485dbce614b3f63182845da43db690b427b7c
Merge commit 'f42485dbce614b3f63182845da43db690b427b7c'

* commit 'f42485dbce614b3f63182845da43db690b427b7c':
  h264: use a separate GetBitContext for slice data

Conflicts:
libavcodec/h264.c
libavcodec/h264_cavlc.c
libavcodec/h264_parser.c
libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cavlc.c
libavcodec/h264_parser.c
libavcodec/h264_refs.c
libavcodec/h264_slice.c