aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/nuv.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-20 02:14:54 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-20 02:14:54 +0100
commit48706f41e1a17e04b0aa09852eff021833708233 (patch)
treed33af96fedd771264c6717eacd2d54800bc05aff /libavformat/nuv.c
parent9d35fa43eea1c0646a5f3e4ba537d58f574b9ca7 (diff)
parenta85ce653fb14ae968419453fabf1ffe10d1f15df (diff)
downloadffmpeg-48706f41e1a17e04b0aa09852eff021833708233.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: mpeg12: check for available bits to avoid an infinite loop fate: add some shorthands to run groups of tests fate: Give some tests more sensible names. cosmetics: Rename ffsink to avsink. Conflicts: avconv.c cmdutils.c cmdutils.h ffmpeg.c ffplay.c tests/fate/audio.mak tests/fate/demux.mak tests/fate/dpcm.mak tests/fate/image.mak tests/fate/lossless-audio.mak tests/fate/lossless-video.mak tests/fate/microsoft.mak tests/fate/pcm.mak tests/fate/real.mak tests/fate/screen.mak tests/fate/video.mak tests/fate/voice.mak tests/fate/wma.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nuv.c')
0 files changed, 0 insertions, 0 deletions