diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-12-31 07:57:59 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-12-12 21:22:49 +0100 |
| commit | 2c6811397bdf13d43ca206e48d6d6da9c2cd47c6 (patch) | |
| tree | 75909934dcab62130bd60a14e9369ef6b78278a1 /libavcodec/jpeg2000dec.c | |
| parent | cdc9ce098e8d101b43b8f68dd35ba7226f4a728c (diff) | |
| download | ffmpeg-2c6811397bdf13d43ca206e48d6d6da9c2cd47c6.tar.gz | |
lavc: add profiles to AVCodecDescriptor
The profiles are a property of the codec, so it makes sense to export
them through AVCodecDescriptors, not just the codec implementations.
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 6f74eefc89..deab1e84c0 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -36,6 +36,7 @@ #include "thread.h" #include "jpeg2000.h" #include "jpeg2000dsp.h" +#include "profiles.h" #define JP2_SIG_TYPE 0x6A502020 #define JP2_SIG_VALUE 0x0D0A870A @@ -1457,15 +1458,6 @@ static const AVOption options[] = { { NULL }, }; -static const AVProfile profiles[] = { - { FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0, "JPEG 2000 codestream restriction 0" }, - { FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1, "JPEG 2000 codestream restriction 1" }, - { FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION, "JPEG 2000 no codestream restrictions" }, - { FF_PROFILE_JPEG2000_DCINEMA_2K, "JPEG 2000 digital cinema 2K" }, - { FF_PROFILE_JPEG2000_DCINEMA_4K, "JPEG 2000 digital cinema 4K" }, - { FF_PROFILE_UNKNOWN }, -}; - static const AVClass class = { .class_name = "jpeg2000", .item_name = av_default_item_name, @@ -1484,5 +1476,5 @@ AVCodec ff_jpeg2000_decoder = { .init = jpeg2000_decode_init, .decode = jpeg2000_decode_frame, .priv_class = &class, - .profiles = NULL_IF_CONFIG_SMALL(profiles) + .profiles = NULL_IF_CONFIG_SMALL(ff_jpeg2000_profiles) }; |