Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: add CODEC_CAP_DR1 to all video decoders missing them
  rtpdec: Cosmetic cleanup

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/bink.c
Simple merge

diff --cc libavcodec/dpx.c
index 9b96ed8,55f71c9..d986157
--- 1/libavcodec/dpx.c
--- 2/libavcodec/dpx.c
+++ b/libavcodec/dpx.c
@@@ -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,
  };

diff --cc libavcodec/indeo3.c
Simple merge

diff --cc libavcodec/indeo4.c
Simple merge

diff --cc libavcodec/indeo5.c
Simple merge

diff --cc libavcodec/kgv1dec.c
Simple merge

diff --cc libavcodec/sgidec.c
index e9ada69,412709c..1805e23
--- 1/libavcodec/sgidec.c
--- 2/libavcodec/sgidec.c
+++ b/libavcodec/sgidec.c
@@@ -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

diff --cc libavcodec/yop.c
Simple merge

diff --cc libavformat/rtpdec.c
Simple merge