aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/aiffenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-21 12:43:32 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-21 12:43:32 +0100
commite168b508163d7dc05176d81e6b5ea73ac23eb38b (patch)
treed6fc72152fcc1e94a4b101380bdf62a28432d564 /libavformat/aiffenc.c
parent137df692fc28710aa1a21856b1f5b9e157896fef (diff)
parentda6be8fcec16a94d8084bda8bb8a0a411a96bcf7 (diff)
downloadffmpeg-e168b508163d7dc05176d81e6b5ea73ac23eb38b.tar.gz
Merge commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7'
* commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7': h264: add a parameter to the MB_FIELD macro. h264: add a parameter to the MB_MBAFF macro. Conflicts: libavcodec/h264.c libavcodec/h264_cabac.c libavcodec/h264_cavlc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aiffenc.c')
0 files changed, 0 insertions, 0 deletions