diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-29 13:15:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-29 13:15:27 +0100 |
| commit | 67420b3de50202c0c71e3c9a57451b4adbcb16ab (patch) | |
| tree | f7be2c59620ee2cc598467de8155ebb7ceab0bdf /libavcodec/dpx.c | |
| parent | 7d1e003abddf18ba43be359c4d3b6194f9f2fbca (diff) | |
| parent | f174fbac3cb127273b8f3df8e05d7156ec1d7658 (diff) | |
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>
Diffstat (limited to 'libavcodec/dpx.c')
| -rw-r--r-- | libavcodec/dpx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index 9b96ed8c64..d9861579ef 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -293,4 +293,5 @@ AVCodec ff_dpx_decoder = { .decode = decode_frame, .capabilities = CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("DPX image"), + .capabilities = CODEC_CAP_DR1, }; |