aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/dv.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-13 17:09:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-13 17:09:13 +0200
commit2a56e65c3b3b53a3a51f290faa33ce0a852cd2a1 (patch)
treeefde2c2d9143d3c7cf103384b19e9a386bf05404 /libavformat/dv.h
parentd0707677fa50f7d75a945e234287a4661962c851 (diff)
parent5d2be71b9ecf2a88752666a2c4039f4d98419d35 (diff)
downloadffmpeg-2a56e65c3b3b53a3a51f290faa33ce0a852cd2a1.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: vc1: Use codec ID from AVCodecContext while parsing frame header avplay: support mid-stream sample rate changes Conflicts: ffplay.c libavcodec/vc1.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/dv.h')
0 files changed, 0 insertions, 0 deletions