diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:58:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:58:00 +0100 |
| commit | 92656787cfeaf28af368bd4c20ffbaedc8ad3ca9 (patch) | |
| tree | e02cc36e4c072e410ff7252b5599f56f186623ed /doc/ffmpeg-codecs.texi | |
| parent | bf4d0f8328c8f64611ca44a6ffdc30ca4f028249 (diff) | |
| parent | 6d2b6f21eb45ffbda1103c772060303648714832 (diff) | |
| download | ffmpeg-92656787cfeaf28af368bd4c20ffbaedc8ad3ca9.tar.gz | |
Merge commit '6d2b6f21eb45ffbda1103c772060303648714832'
* commit '6d2b6f21eb45ffbda1103c772060303648714832':
h264: add a parameter to the CABAC macro.
h264: add a parameter to the FIELD_OR_MBAFF_PICTURE macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg-codecs.texi')
0 files changed, 0 insertions, 0 deletions