Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jan 2013 13:49:12 +0000 (14:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jan 2013 13:49:49 +0000 (14:49 +0100)
commitafb4bc3d291f4cc6b67b635305d30a097cb2a82d
treeabf13c6844cf4a0921b6fb91edd607717c883829
parent91f359292a52b7acf3785ea4c399b20d8fbd24e5
parent61d36761efda663c5ce07a5ec13659431b08f3c2
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Simplify code by using avio_wb24
  bfin: unbreak compilation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/bfin/vp3_bfin.c
libavcodec/bfin/vp3_bfin.h
libavformat/movenc.c