diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 18:58:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 18:58:01 +0200 |
| commit | 9cf95654ac90214bbec9904f7e96525799172db9 (patch) | |
| tree | e2bc50d8dd0d2975ba6181d8edd9c0c654a96cb6 | |
| parent | 811008b8eeaad4b7efe7281b18e9bff89e37d470 (diff) | |
| parent | 007e27d363ba7d994019dc897dc9c39071bb204a (diff) | |
| download | ffmpeg-streaming-9cf95654ac90214bbec9904f7e96525799172db9.zip ffmpeg-streaming-9cf95654ac90214bbec9904f7e96525799172db9.tar.gz | |
Merge commit '007e27d363ba7d994019dc897dc9c39071bb204a'
* commit '007e27d363ba7d994019dc897dc9c39071bb204a':
avcodec: add missing CODEC_CAP_DR1 to codecs using get_buffer()
Conflicts:
libavcodec/atrac3plusdec.c
libavcodec/sp5xdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/atrac3plusdec.c | 1 | ||||
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/sp5xdec.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/atrac3plusdec.c b/libavcodec/atrac3plusdec.c index b4437f1..078d41c 100644 --- a/libavcodec/atrac3plusdec.c +++ b/libavcodec/atrac3plusdec.c @@ -392,6 +392,7 @@ AVCodec ff_atrac3p_decoder = { .long_name = NULL_IF_CONFIG_SMALL("ATRAC3+ (Adaptive TRansform Acoustic Coding 3+)"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_ATRAC3P, + .capabilities = CODEC_CAP_DR1, .priv_data_size = sizeof(ATRAC3PContext), .init = atrac3p_decode_init, .close = atrac3p_decode_close, diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index dee2634..5690dfd 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2156,7 +2156,7 @@ AVCodec ff_jpeg2000_decoder = { .long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_JPEG2000, - .capabilities = CODEC_CAP_FRAME_THREADS, + .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_DR1, .priv_data_size = sizeof(Jpeg2000DecoderContext), .init_static_data = jpeg2000_init_static_data, .init = jpeg2000_decode_init, diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c index 3e49c59e..5925c01 100644 --- a/libavcodec/sp5xdec.c +++ b/libavcodec/sp5xdec.c @@ -120,6 +120,7 @@ AVCodec ff_amv_decoder = { .close = ff_mjpeg_decode_end, .decode = sp5x_decode_frame, .max_lowres = 3, + .capabilities = CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif |
