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)
commit67420b3de50202c0c71e3c9a57451b4adbcb16ab
treef7be2c59620ee2cc598467de8155ebb7ceab0bdf
parent7d1e003abddf18ba43be359c4d3b6194f9f2fbca
parentf174fbac3cb127273b8f3df8e05d7156ec1d7658
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>
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