diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 03:52:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 03:52:16 +0200 |
| commit | ca90ca8ce365261355f3b66936b9cc011fdd1cdc (patch) | |
| tree | 1ddcea613050917b11a53069c43ad6bc1725aec1 /libavcodec/version.h | |
| parent | a58e10e5d1e9b26733087f536a0eb0c525523218 (diff) | |
| parent | 6647aa0426e73839b9b1d1c9d86188f469167531 (diff) | |
| download | ffmpeg-ca90ca8ce365261355f3b66936b9cc011fdd1cdc.tar.gz | |
Merge commit '6647aa0426e73839b9b1d1c9d86188f469167531'
* commit '6647aa0426e73839b9b1d1c9d86188f469167531':
indeo4: add missing Haar and slanted transforms
dxtory v2 support
Conflicts:
libavcodec/indeo4.c
libavcodec/ivi_dsp.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 40dc75870f..b904048c23 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 12 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |