diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 13:59:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 14:00:21 +0100 |
| commit | 53c2f401f726732e56343377452e487c8c6a0ee1 (patch) | |
| tree | d472c200b5b6e28c0f14c22194e80fc1fc37e833 /libavcodec/version.h | |
| parent | 41bdef1d39584727c9deaa42b86d085138098231 (diff) | |
| parent | 246da0b13551b1f80f067e4f258e5bd691f5ab33 (diff) | |
| download | ffmpeg-streaming-53c2f401f726732e56343377452e487c8c6a0ee1.zip ffmpeg-streaming-53c2f401f726732e56343377452e487c8c6a0ee1.tar.gz | |
Merge commit '246da0b13551b1f80f067e4f258e5bd691f5ab33'
* commit '246da0b13551b1f80f067e4f258e5bd691f5ab33':
v4l2: avoid pointless indirection.
vdpau: Add VC-1 decoding via hwaccel infrastructure
vdpau: Add H.264 decoding via hwaccel infrastructure
Conflicts:
configure
libavcodec/Makefile
libavcodec/version.h
libavdevice/v4l2.c
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 b5b826a..9c1e228 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 88 +#define LIBAVCODEC_VERSION_MINOR 89 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |
