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 /libavutil/version.h | |
| 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 'libavutil/version.h')
| -rw-r--r-- | libavutil/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index af2540dee8..7d1ab9c312 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 24 +#define LIBAVUTIL_VERSION_MINOR 25 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |