Merge commit '06d433366c02ab81a1aaad33d32934b4180d354b' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 18:04:29 +0000 (19:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 18:04:42 +0000 (19:04 +0100)
* commit '06d433366c02ab81a1aaad33d32934b4180d354b':
  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