diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 14:13:45 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 14:13:45 +0100 |
commit | 1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9 (patch) | |
tree | 192b6341b447e51b2121dc17509ce852fa36405b /libavcodec/version.h | |
parent | b91fa5fcca70bdf188b757084edd444d4d8530c9 (diff) | |
parent | 9a07c1332cfe092b57b5758f22b686ca58806c60 (diff) | |
download | ffmpeg-streaming-1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9.zip ffmpeg-streaming-1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9.tar.gz |
Merge commit '9a07c1332cfe092b57b5758f22b686ca58806c60'
* commit '9a07c1332cfe092b57b5758f22b686ca58806c60':
parser: Move Doxygen documentation to the header files
PGS subtitles: Expose forced flag
x86: PMINUB: port to cpuflags
Conflicts:
libavcodec/avcodec.h
libavcodec/pgssubdec.c
libavcodec/version.h
libavcodec/x86/ac3dsp.asm
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 67ff169..ec874f4 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 54 -#define LIBAVCODEC_VERSION_MINOR 70 +#define LIBAVCODEC_VERSION_MINOR 71 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |