Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Oct 2012 12:15:16 +0000 (13:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Oct 2012 12:15:27 +0000 (13:15 +0100)
* qatar/master:
  lavc: add CODEC_CAP_DR1 to all video decoders missing them
  rtpdec: Cosmetic cleanup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/bink.c
libavcodec/dpx.c
libavcodec/indeo3.c
libavcodec/indeo4.c
libavcodec/indeo5.c
libavcodec/kgv1dec.c
libavcodec/sgidec.c
libavcodec/vb.c
libavcodec/yop.c
libavformat/rtpdec.c

Simple merge
@@@ -291,6 -242,6 +291,7 @@@ AVCodec ff_dpx_decoder = 
      .init           = decode_init,
      .close          = decode_end,
      .decode         = decode_frame,
 +    .capabilities   = CODEC_CAP_DR1,
      .long_name      = NULL_IF_CONFIG_SMALL("DPX image"),
+     .capabilities   = CODEC_CAP_DR1,
  };
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -267,6 -266,6 +267,7 @@@ AVCodec ff_sgi_decoder = 
      .init           = sgi_init,
      .close          = sgi_end,
      .decode         = decode_frame,
 +    .capabilities   = CODEC_CAP_DR1,
      .long_name      = NULL_IF_CONFIG_SMALL("SGI image"),
+     .capabilities   = CODEC_CAP_DR1,
  };
diff --cc libavcodec/vb.c
Simple merge
Simple merge
Simple merge