diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 19:58:01 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 19:58:01 +0300 |
| commit | 9cf95654ac90214bbec9904f7e96525799172db9 (patch) | |
| tree | e2bc50d8dd0d2975ba6181d8edd9c0c654a96cb6 /libavcodec/jpeg2000dec.c | |
| parent | 811008b8eeaad4b7efe7281b18e9bff89e37d470 (diff) | |
| parent | 007e27d363ba7d994019dc897dc9c39071bb204a (diff) | |
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>
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index dee26347bd..5690dfde5d 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, |