diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 12:23:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 12:24:04 +0100 |
| commit | e3654b25cfba87b5a2cfb821282c35602b48a337 (patch) | |
| tree | aed679357a7f48464b09fb689c30773ec6334a80 /libavcodec/avuidec.c | |
| parent | b837d5bf83f982410fd94f6a2aaa24c29e5e770f (diff) | |
| parent | fa4604d80580dde45bfce32ebe04a5c13c233895 (diff) | |
| download | ffmpeg-e3654b25cfba87b5a2cfb821282c35602b48a337.tar.gz | |
Merge commit 'fa4604d80580dde45bfce32ebe04a5c13c233895' into release/2.2
* commit 'fa4604d80580dde45bfce32ebe04a5c13c233895':
h264: Do not share rbsp_buffer across threads
Conflicts:
libavcodec/h264.c
See: ecbf838c7d81ebd3b89fe75d83ff29150dbda27a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avuidec.c')
0 files changed, 0 insertions, 0 deletions