Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Aug 2011 14:32:39 +0000 (16:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Aug 2011 14:32:39 +0000 (16:32 +0200)
commit3a1df52e3ce70f41c4f8b9900be2c2907b7e21ef
treefd33523cf6ed3e5fd50a2a328c588a9a3e722fdd
parentaae1c247b1cd5f17c137f5c7f357c519200b1017
parent7351eb14151602fa924ab3d5e374b7d60f32aff9
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Pretty-print RV3/4 decoder source
  Saner RV1/2 initialisation and RV2 header parsing.

Conflicts:
libavcodec/rv10.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/rv10.c
libavcodec/rv30.c
libavcodec/rv30dsp.c
libavcodec/rv34.c
libavcodec/rv40.c
libavcodec/rv40dsp.c