diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 14:38:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 14:58:19 +0200 |
| commit | 82db8ee3211014a38db6b8cae03f1c3246938eee (patch) | |
| tree | acac8aa9b5b38bcbcb5c34a77f076adee3c28465 /libavcodec/version.h | |
| parent | f7f5370b4b413c05f6ed848bffb85d28c5f44b9c (diff) | |
| parent | fd41cb43702498948ff14ba8c284fd5c15fc729d (diff) | |
| download | ffmpeg-82db8ee3211014a38db6b8cae03f1c3246938eee.tar.gz | |
Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'
* commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d':
avconv: improve sample format negotiation for decoder request
Opus encoder using libopus
mpegts: Drop pointless casting of hex_dump_debug arguments
avformat: const correctness for av_hex_dump / av_hex_dump_log
wmadec: Adjust debug printf argument length modifier
Conflicts:
Changelog
ffmpeg.c
libavcodec/libopusdec.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 7e0b96b408..1ac16bc7a1 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 62 +#define LIBAVCODEC_VERSION_MINOR 63 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |