diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 13:38:04 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 13:48:30 +0100 |
commit | 41bdef1d39584727c9deaa42b86d085138098231 (patch) | |
tree | 78afed4ca96612bcd7dad87378c826aecc51f58e /libavcodec/version.h | |
parent | 8ee7b3881bfe96981de28d6eedaf1dcb59fe3215 (diff) | |
parent | 200e8ac92007bc2fe30da05d3bd00ab620842a6b (diff) | |
download | ffmpeg-streaming-41bdef1d39584727c9deaa42b86d085138098231.zip ffmpeg-streaming-41bdef1d39584727c9deaa42b86d085138098231.tar.gz |
Merge commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b'
* commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b':
vdpau: Add MPEG-4 decoding via hwaccel infrastructure
vdpau: Add MPEG-1/2 decoding via hwaccel infrastructure
Conflicts:
configure
libavcodec/Makefile
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 f8b474d..b5b826a 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 87 +#define LIBAVCODEC_VERSION_MINOR 88 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |