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 | |
| parent | 7d1e003abddf18ba43be359c4d3b6194f9f2fbca (diff) | |
| parent | f174fbac3cb127273b8f3df8e05d7156ec1d7658 (diff) | |
| download | ffmpeg-67420b3de50202c0c71e3c9a57451b4adbcb16ab.tar.gz | |
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')
| -rw-r--r-- | libavcodec/bink.c | 1 | ||||
| -rw-r--r-- | libavcodec/dpx.c | 1 | ||||
| -rw-r--r-- | libavcodec/indeo3.c | 1 | ||||
| -rw-r--r-- | libavcodec/indeo4.c | 1 | ||||
| -rw-r--r-- | libavcodec/indeo5.c | 1 | ||||
| -rw-r--r-- | libavcodec/kgv1dec.c | 1 | ||||
| -rw-r--r-- | libavcodec/sgidec.c | 1 | ||||
| -rw-r--r-- | libavcodec/vb.c | 1 | ||||
| -rw-r--r-- | libavcodec/yop.c | 1 |
9 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/bink.c b/libavcodec/bink.c index 31e4ac30da..91cd651468 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -1328,4 +1328,5 @@ AVCodec ff_bink_decoder = { .close = decode_end, .decode = decode_frame, .long_name = NULL_IF_CONFIG_SMALL("Bink video"), + .capabilities = CODEC_CAP_DR1, }; 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, }; diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index 404d24a84f..1f231548cc 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -1143,4 +1143,5 @@ AVCodec ff_indeo3_decoder = { .decode = decode_frame, .capabilities = CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 3"), + .capabilities = CODEC_CAP_DR1, }; diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index a3d7e6cde1..1d6d0490e6 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -646,4 +646,5 @@ AVCodec ff_indeo4_decoder = { .close = ff_ivi_decode_close, .decode = ff_ivi_decode_frame, .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 4"), + .capabilities = CODEC_CAP_DR1, }; diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index 423d79b53a..52dddd2ad9 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -674,4 +674,5 @@ AVCodec ff_indeo5_decoder = { .close = ff_ivi_decode_close, .decode = ff_ivi_decode_frame, .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 5"), + .capabilities = CODEC_CAP_DR1, }; diff --git a/libavcodec/kgv1dec.c b/libavcodec/kgv1dec.c index 1cbd1c3489..6552dc537f 100644 --- a/libavcodec/kgv1dec.c +++ b/libavcodec/kgv1dec.c @@ -191,4 +191,5 @@ AVCodec ff_kgv1_decoder = { .decode = decode_frame, .flush = decode_flush, .long_name = NULL_IF_CONFIG_SMALL("Kega Game Video"), + .capabilities = CODEC_CAP_DR1, }; diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c index e9ada699e4..1805e23574 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -269,4 +269,5 @@ AVCodec ff_sgi_decoder = { .decode = decode_frame, .capabilities = CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("SGI image"), + .capabilities = CODEC_CAP_DR1, }; diff --git a/libavcodec/vb.c b/libavcodec/vb.c index 78ef669c3a..512945810e 100644 --- a/libavcodec/vb.c +++ b/libavcodec/vb.c @@ -280,4 +280,5 @@ AVCodec ff_vb_decoder = { .close = decode_end, .decode = decode_frame, .long_name = NULL_IF_CONFIG_SMALL("Beam Software VB"), + .capabilities = CODEC_CAP_DR1, }; diff --git a/libavcodec/yop.c b/libavcodec/yop.c index 255ed32ca7..905b84f68d 100644 --- a/libavcodec/yop.c +++ b/libavcodec/yop.c @@ -272,4 +272,5 @@ AVCodec ff_yop_decoder = { .close = yop_decode_close, .decode = yop_decode_frame, .long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP Video"), + .capabilities = CODEC_CAP_DR1, }; |