Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Oct 2012 12:15:47 +0000 (14:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Oct 2012 12:15:47 +0000 (14:15 +0200)
commitc5fd9d3c35cb743226770e1077e6b082f44bd889
treee27eecd0a854a9e8a2374410b343f756835a468e
parent81ff0c24ef050c1877639ecc3ba6c485fde0a74e
parent61cc99748c1107a2f07491ce768156cc74b95e29
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Add proper dependencies in qt.mak
  fate: Add proper dependencies in lossless-video.mak
  indeo3: do not try to output more lines than we can fit
  bmv: get a new frame on every decode_frame(), so we can use direct rendering

Conflicts:
libavcodec/bmv.c
tests/fate/lossless-video.mak
tests/fate/qt.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/bmv.c
libavcodec/indeo3.c
tests/fate/lossless-video.mak
tests/fate/qt.mak