diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:16:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:16:29 +0100 |
| commit | 2cc08cad9ecf2d2524bc572a4e9bbe659b330d5c (patch) | |
| tree | 22e474fc2d32d8874b8a27766006a87239fb437a /libavcodec/h263_parser.h | |
| parent | 892a6d00280215ab4c1485c0931912f82318dc63 (diff) | |
| parent | 5f390eef8ee2b8adab00c5d2923a52aa261eb999 (diff) | |
| download | ffmpeg-2cc08cad9ecf2d2524bc572a4e9bbe659b330d5c.tar.gz | |
Merge commit '5f390eef8ee2b8adab00c5d2923a52aa261eb999'
* commit '5f390eef8ee2b8adab00c5d2923a52aa261eb999':
h264: move mb_[uv]linesize into the per-slice context
Conflicts:
libavcodec/h264.h
libavcodec/h264_mb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263_parser.h')
0 files changed, 0 insertions, 0 deletions