diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 22:52:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 22:52:12 +0200 |
| commit | c1d053621c2c437505c22321e12b2d2e71976a00 (patch) | |
| tree | fe12c2e130fe792324ef0408184bb82acd981c24 /libavutil/version.h | |
| parent | 652061313979b99f91b27309ecd8baeef7b7865f (diff) | |
| parent | 8542f9c4f17125d483c40c0c5723842f1c982f81 (diff) | |
| download | ffmpeg-c1d053621c2c437505c22321e12b2d2e71976a00.tar.gz | |
Merge commit '8542f9c4f17125d483c40c0c5723842f1c982f81'
* commit '8542f9c4f17125d483c40c0c5723842f1c982f81':
replaygain: correctly parse peak values
Conflicts:
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 38f9bce6f7..6f1de4ff6b 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,7 +56,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 73 +#define LIBAVUTIL_VERSION_MINOR 74 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |