diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 14:27:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 14:27:48 +0100 |
| commit | 73b59cc1bad802612d04c112844aab49953ede64 (patch) | |
| tree | fc10f203df63429499223682b39940a2f7cab14f /libavformat/version.h | |
| parent | eb2f499e37ee8c890836f80c3ffba57e971fe514 (diff) | |
| parent | 4f56e773fe8a554b8c2662650aaf799c2ece2721 (diff) | |
| download | ffmpeg-73b59cc1bad802612d04c112844aab49953ede64.tar.gz | |
Merge commit '4f56e773fe8a554b8c2662650aaf799c2ece2721'
* commit '4f56e773fe8a554b8c2662650aaf799c2ece2721':
x86: ac3: Fix HAVE_MMXEXT condition to only refer to external assembly
rtpenc: Start the sequence numbers from a random offset
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
| -rw-r--r-- | libavformat/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index ef0cc053d1..dcac2568b4 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 54 #define LIBAVFORMAT_VERSION_MINOR 61 -#define LIBAVFORMAT_VERSION_MICRO 102 +#define LIBAVFORMAT_VERSION_MICRO 103 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |