diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-05 12:26:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-05 12:39:06 +0200 |
| commit | 8e85b69d716b031cf7b01e5a22d79823c8d5aeca (patch) | |
| tree | ee47d321f09f5bcccd46b47005e79f3dce5b42b6 /libavformat/img2.c | |
| parent | 495ed19b5bb0b3facb1833001dce4a4419e82800 (diff) | |
| parent | 8c65264595d5a82c56ae5043320e4b875a414229 (diff) | |
| download | ffmpeg-8e85b69d716b031cf7b01e5a22d79823c8d5aeca.tar.gz | |
Merge commit '8c65264595d5a82c56ae5043320e4b875a414229'
* commit '8c65264595d5a82c56ae5043320e4b875a414229':
pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values
img2: Add j2k file extension for JPEG 2000
Conflicts:
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2.c')
| -rw-r--r-- | libavformat/img2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index b7c50fe777..270ffd9aca 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -67,9 +67,9 @@ static const IdStrMap img_tags[] = { { AV_CODEC_ID_SUNRAST, "im32" }, { AV_CODEC_ID_SUNRAST, "sunras" }, { AV_CODEC_ID_JPEG2000, "j2c" }, - { AV_CODEC_ID_JPEG2000, "j2k" }, { AV_CODEC_ID_JPEG2000, "jp2" }, { AV_CODEC_ID_JPEG2000, "jpc" }, + { AV_CODEC_ID_JPEG2000, "j2k" }, { AV_CODEC_ID_DPX, "dpx" }, { AV_CODEC_ID_EXR, "exr" }, { AV_CODEC_ID_PICTOR, "pic" }, |