diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 17:15:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 17:31:55 +0200 |
| commit | bb3ed3bae6a9e6e2dbe8deeb45088453f214b770 (patch) | |
| tree | 2cb536f24abb5d9cfc275848da43d93d4302d0d2 /libavcodec/version.h | |
| parent | aee51039ee204197fdb4c924f8ee433b803ab1e1 (diff) | |
| parent | b96509c93ce6ebb0e997e0b2a55cf10c786a2812 (diff) | |
| download | ffmpeg-bb3ed3bae6a9e6e2dbe8deeb45088453f214b770.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: Add FATE tests for the Ut Video encoder
lavc: add Ut Video encoder
mpegvideo_enc: remove stray duplicate line from 7f9aaa4
swscale: x86: fix #endif comments in rgb2rgb template file
avconv: mark more options as expert.
avconv: split printing "main options" into global and per-file.
avconv: refactor help printing.
Conflicts:
Changelog
ffmpeg_opt.c
ffserver.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 7f4db0b566..bf741020fa 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -27,7 +27,7 @@ */ #define LIBAVCODEC_VERSION_MAJOR 54 -#define LIBAVCODEC_VERSION_MINOR 53 +#define LIBAVCODEC_VERSION_MINOR 54 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |