mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit '38389058c3308758c6365abd0f6b45c5e62bb90b'
* commit '38389058c3308758c6365abd0f6b45c5e62bb90b': OpenEXR decoder Conflicts: Changelog configure libavcodec/Makefile libavcodec/avcodec.h libavcodec/exr.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
95582b5ccc
@ -11,6 +11,7 @@ version <next>:
|
||||
- Improvments to the BRender PIX image decoder
|
||||
- Improvments to the XBM decoder
|
||||
- QTKit input device
|
||||
- improvments to OpenEXR image decoder
|
||||
|
||||
|
||||
version 2.2:
|
||||
|
@ -289,6 +289,7 @@ enum AVCodecID {
|
||||
AV_CODEC_ID_ALIAS_PIX,
|
||||
AV_CODEC_ID_BRENDER_PIX_DEPRECATED,
|
||||
AV_CODEC_ID_PAF_VIDEO_DEPRECATED,
|
||||
AV_CODEC_ID_EXR_DEPRECATED,
|
||||
|
||||
AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'),
|
||||
AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'),
|
||||
|
@ -1102,14 +1102,6 @@ static const AVCodecDescriptor codec_descriptors[] = {
|
||||
.long_name = NULL_IF_CONFIG_SMALL("Escape 130"),
|
||||
.props = AV_CODEC_PROP_LOSSY,
|
||||
},
|
||||
{
|
||||
.id = AV_CODEC_ID_EXR,
|
||||
.type = AVMEDIA_TYPE_VIDEO,
|
||||
.name = "exr",
|
||||
.long_name = NULL_IF_CONFIG_SMALL("OpenEXR image"),
|
||||
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY |
|
||||
AV_CODEC_PROP_LOSSLESS,
|
||||
},
|
||||
{
|
||||
.id = AV_CODEC_ID_AVRP,
|
||||
.type = AVMEDIA_TYPE_VIDEO,
|
||||
@ -1271,6 +1263,14 @@ static const AVCodecDescriptor codec_descriptors[] = {
|
||||
.long_name = NULL_IF_CONFIG_SMALL("DPX (Digital Picture Exchange) image"),
|
||||
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
|
||||
},
|
||||
{
|
||||
.id = AV_CODEC_ID_EXR,
|
||||
.type = AVMEDIA_TYPE_VIDEO,
|
||||
.name = "exr",
|
||||
.long_name = NULL_IF_CONFIG_SMALL("OpenEXR image"),
|
||||
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY |
|
||||
AV_CODEC_PROP_LOSSLESS,
|
||||
},
|
||||
{
|
||||
.id = AV_CODEC_ID_GIF,
|
||||
.type = AVMEDIA_TYPE_VIDEO,
|
||||
|
795
libavcodec/exr.c
795
libavcodec/exr.c
File diff suppressed because it is too large
Load Diff
@ -2682,6 +2682,7 @@ static enum AVCodecID remap_deprecated_codec_id(enum AVCodecID id)
|
||||
case AV_CODEC_ID_PCM_S24LE_PLANAR_DEPRECATED : return AV_CODEC_ID_PCM_S24LE_PLANAR;
|
||||
case AV_CODEC_ID_PCM_S32LE_PLANAR_DEPRECATED : return AV_CODEC_ID_PCM_S32LE_PLANAR;
|
||||
case AV_CODEC_ID_ESCAPE130_DEPRECATED : return AV_CODEC_ID_ESCAPE130;
|
||||
case AV_CODEC_ID_EXR_DEPRECATED : return AV_CODEC_ID_EXR;
|
||||
case AV_CODEC_ID_G2M_DEPRECATED : return AV_CODEC_ID_G2M;
|
||||
case AV_CODEC_ID_PAF_VIDEO_DEPRECATED : return AV_CODEC_ID_PAF_VIDEO;
|
||||
case AV_CODEC_ID_WEBP_DEPRECATED: return AV_CODEC_ID_WEBP;
|
||||
|
@ -30,7 +30,7 @@
|
||||
|
||||
#define LIBAVCODEC_VERSION_MAJOR 55
|
||||
#define LIBAVCODEC_VERSION_MINOR 55
|
||||
#define LIBAVCODEC_VERSION_MICRO 106
|
||||
#define LIBAVCODEC_VERSION_MICRO 107
|
||||
|
||||
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
||||
LIBAVCODEC_VERSION_MINOR, \
|
||||
|
Loading…
Reference in New Issue
Block a user