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>

diff --cc libavcodec/rv10.c
index dfd384a,3939984..d53265b
--- 1/libavcodec/rv10.c
--- 2/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@@ -292,31 -296,8 +296,25 @@@ static int rv10_decode_picture_header(M
  static int rv20_decode_picture_header(MpegEncContext *s)
  {
      int seq, mb_pos, i;
+     int rpr_bits;
  
-     if(s->avctx->sub_id == 0x30202002 || s->avctx->sub_id == 0x30203002){
-         if (get_bits(&s->gb, 3)){
-             av_log(s->avctx, AV_LOG_ERROR, "unknown triplet set\n");
-             return -1;
-         }
-     }
- 
 +#if 0
 +    GetBitContext gb= s->gb;
 +    for(i=0; i<64; i++){
 +        av_log(s->avctx, AV_LOG_DEBUG, "%d", get_bits1(&gb));
 +        if(i%4==3) av_log(s->avctx, AV_LOG_DEBUG, " ");
 +    }
 +    av_log(s->avctx, AV_LOG_DEBUG, "\n");
 +#endif
 +#if 0
 +    av_log(s->avctx, AV_LOG_DEBUG, "%3dx%03d/%02Xx%02X ", s->width, s->height, s->width/4, s->height/4);
 +    for(i=0; i<s->avctx->extradata_size; i++){
 +        av_log(s->avctx, AV_LOG_DEBUG, "%02X ", ((uint8_t*)s->avctx->extradata)[i]);
 +        if(i%4==3) av_log(s->avctx, AV_LOG_DEBUG, " ");
 +    }
 +    av_log(s->avctx, AV_LOG_DEBUG, "\n");
 +#endif
 +
      i= get_bits(&s->gb, 2);
      switch(i){
      case 0: s->pict_type= AV_PICTURE_TYPE_I; break;

diff --cc libavcodec/rv30.c
Simple merge

diff --cc libavcodec/rv30dsp.c
Simple merge

diff --cc libavcodec/rv34.c
Simple merge

diff --cc libavcodec/rv40.c
Simple merge

diff --cc libavcodec/rv40dsp.c
Simple merge