Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Oct 2012 15:09:13 +0000 (17:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Oct 2012 15:09:13 +0000 (17:09 +0200)
commit2a56e65c3b3b53a3a51f290faa33ce0a852cd2a1
treeefde2c2d9143d3c7cf103384b19e9a386bf05404
parentd0707677fa50f7d75a945e234287a4661962c851
parent5d2be71b9ecf2a88752666a2c4039f4d98419d35
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>
libavcodec/vc1.c