aboutsummaryrefslogtreecommitdiffstats
path: root/tests/fate/image.mak
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-06 22:52:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-06 22:52:01 +0200
commit2e0c360abd74b94991aa9a271cadc72aae1471c2 (patch)
treecbea40b59f334f8f7447a79b6fbdf514f0dd2e0c /tests/fate/image.mak
parentbd128e9bff8aaec97ce7dcd414717c214536c7d9 (diff)
parent20234a4bd7e187ae31f9a66b5c40e98666bc30e4 (diff)
downloadffmpeg-2e0c360abd74b94991aa9a271cadc72aae1471c2.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: cosmetics: Align muxer/demuxer declarations mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning avcodec: remove avcodec_guess_channel_layout() avutil: Add av_get_default_channel_layout() Conflicts: doc/APIchanges libavcodec/mpeg12.c libavformat/cdg.c libavformat/matroskaenc.c libavformat/mpegts.c libavformat/nuv.c libavformat/wav.c libavutil/audioconvert.c libavutil/audioconvert.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/image.mak')
0 files changed, 0 insertions, 0 deletions