Merge commit '9404a47a2d1df418946a338938eb6cdb3afed474'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 14:08:17 +0000 (15:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 14:08:17 +0000 (15:08 +0100)
commit6e57d2da9058fcb0eefedf5102321a044d51e6dc
treee82b054777bafd5d12b2c04f6a27c6cf1daa3519
parent3d0411707839d3af1f34e0a8c7c8cbe4dd02b1ba
parent9404a47a2d1df418946a338938eb6cdb3afed474
Merge commit '9404a47a2d1df418946a338938eb6cdb3afed474'

* commit '9404a47a2d1df418946a338938eb6cdb3afed474':
  h264: move parser-only variables to their own context

Conflicts:
libavcodec/h264_parser.c

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