Merge commit '61928b68dc28e080b8c8191afe5541123c682bbd'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Jan 2015 21:41:39 +0000 (22:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Jan 2015 21:44:09 +0000 (22:44 +0100)
* commit '61928b68dc28e080b8c8191afe5541123c682bbd':
  h264: Do not share rbsp_buffer across threads

Conflicts:
libavcodec/h264.c

See: ecbf838c7d81ebd3b89fe75d83ff29150dbda27a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264.c

Simple merge