diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:50:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:50:18 +0100 |
| commit | bf4d0f8328c8f64611ca44a6ffdc30ca4f028249 (patch) | |
| tree | e37df66f9571e2753a827c23ba8c075a8af5d323 /libavformat/mmf.c | |
| parent | e168b508163d7dc05176d81e6b5ea73ac23eb38b (diff) | |
| parent | 7fa00653a550c0d24b3951c0f9fed6350ecf5ce4 (diff) | |
| download | ffmpeg-bf4d0f8328c8f64611ca44a6ffdc30ca4f028249.tar.gz | |
Merge commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4'
* commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4':
h264: add a parameter to the FIELD_PICTURE macro.
h264: add a parameter to the FRAME_MBAFF macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mmf.c')
0 files changed, 0 insertions, 0 deletions