diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:13:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:13:24 +0100 |
| commit | 55215383dc04365935c86f8a4db7b5396f1e3541 (patch) | |
| tree | 416380f73859591236b30e05a5213f66525c6822 /libavcodec/txd.c | |
| parent | 727b202330712eb981eb008b1e7a936d71092f71 (diff) | |
| parent | f42485dbce614b3f63182845da43db690b427b7c (diff) | |
| download | ffmpeg-55215383dc04365935c86f8a4db7b5396f1e3541.tar.gz | |
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>
Diffstat (limited to 'libavcodec/txd.c')
0 files changed, 0 insertions, 0 deletions