diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 18:20:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 18:20:37 +0200 |
| commit | 78eaaa857e95fa5542dc008c8ad3664e6ab6801a (patch) | |
| tree | 41bed9cbaefc6147bd6acbb8018e9e1dd33544ca /libavresample/version.h | |
| parent | 0d0d24af0159ff08f396ad04cd63ce5655b1fc60 (diff) | |
| parent | fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45 (diff) | |
| download | ffmpeg-streaming-78eaaa857e95fa5542dc008c8ad3664e6ab6801a.zip ffmpeg-streaming-78eaaa857e95fa5542dc008c8ad3664e6ab6801a.tar.gz | |
Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'
* commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45':
avresample: Introduce AVFrame-based API
Conflicts:
libavresample/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/version.h')
| -rw-r--r-- | libavresample/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavresample/version.h b/libavresample/version.h index 621d330..33ff2a2 100644 --- a/libavresample/version.h +++ b/libavresample/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVRESAMPLE_VERSION_MAJOR 2 -#define LIBAVRESAMPLE_VERSION_MINOR 0 +#define LIBAVRESAMPLE_VERSION_MINOR 1 #define LIBAVRESAMPLE_VERSION_MICRO 0 #define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \ |
