diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:59:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:18:10 +0100 |
| commit | cc2cfdc49786a8268d1514661c17ea96035d6f1d (patch) | |
| tree | fd17d2f29472b84fce724d66fc982ee51f7cd42f /libavformat/tcp.c | |
| parent | 27b3522ba3cf539e13bb0f8f9c68d2dd513a8f73 (diff) | |
| parent | 95eb35f30513e335990ad0d5dca6ddc318477291 (diff) | |
| download | ffmpeg-cc2cfdc49786a8268d1514661c17ea96035d6f1d.tar.gz | |
Merge commit '95eb35f30513e335990ad0d5dca6ddc318477291'
* commit '95eb35f30513e335990ad0d5dca6ddc318477291':
h264: move the ref lists variables into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_direct.c
libavcodec/h264_mb.c
libavcodec/h264_picture.c
libavcodec/h264_refs.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/tcp.c')
0 files changed, 0 insertions, 0 deletions