diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 20:10:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 20:16:21 +0100 |
| commit | 84ae7294cbaa413b80d632f79d539270dd4bd6b5 (patch) | |
| tree | e44e4c10830565c3072d871405c57a64661eef85 /libavcodec/lagarithrac.h | |
| parent | 830e548b9ec32ad7ab02be056db15cbcf3c58346 (diff) | |
| parent | 3178f4d33ff62243f7cdddb081db516ea34396c9 (diff) | |
| download | ffmpeg-84ae7294cbaa413b80d632f79d539270dd4bd6b5.tar.gz | |
Merge commit '3178f4d33ff62243f7cdddb081db516ea34396c9'
* commit '3178f4d33ff62243f7cdddb081db516ea34396c9':
h264: move rbsp_buffer into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_parser.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/lagarithrac.h')
0 files changed, 0 insertions, 0 deletions