aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/cavsvideodec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-15 04:37:17 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-15 04:50:06 +0200
commit85b21147594101ba2d8e7ea2cfa504c0d1baee5a (patch)
tree62927788e459965cea1ff4cd23c219fcf0410b0e /libavformat/cavsvideodec.c
parent256c5b08bf09cb6403790d731cc1c771d8fb0e94 (diff)
parenta3a0af4fb1237bed0af75868073f9a63db8b1864 (diff)
downloadffmpeg-85b21147594101ba2d8e7ea2cfa504c0d1baee5a.tar.gz
Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864'
* commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864': avutil: make aes and sha api public handle malloc failures in ff_get_wav_header add xWMA demuxer mpegts: force the default timebase libavcodec: Bump micro after adding the dtx AVOptions Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/cavsvideodec.c')
0 files changed, 0 insertions, 0 deletions