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 /libavcodec/sp5xdec.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/sp5xdec.c')
| -rw-r--r-- | libavcodec/sp5xdec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c index 3e49c59e06..5925c01087 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 |