diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 13:06:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 13:06:14 +0100 |
| commit | 86d9d349cce54984ef7f4b67647ae73bf1c48f88 (patch) | |
| tree | f1a65e0d48eb386d67b993fd9e56ddf3051614cd /libavformat/swf.c | |
| parent | 92656787cfeaf28af368bd4c20ffbaedc8ad3ca9 (diff) | |
| parent | 23e85be58fc64b2e804e68b0034a08a6d257e523 (diff) | |
| download | ffmpeg-86d9d349cce54984ef7f4b67647ae73bf1c48f88.tar.gz | |
Merge commit '23e85be58fc64b2e804e68b0034a08a6d257e523'
* commit '23e85be58fc64b2e804e68b0034a08a6d257e523':
h264: add a parameter to the CHROMA444 macro.
h264: add a parameter to the CHROMA422 macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/swf.c')
0 files changed, 0 insertions, 0 deletions