diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 01:18:17 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 01:23:22 +0200 |
commit | bdb2e80e88e76cc39c6d85a8f1c1712d36e18966 (patch) | |
tree | 230646af1610b055a198af67574b1d823fc50d76 /libavresample/version.h | |
parent | a8499cbbe87d00456c391f41207e1981bd7f746a (diff) | |
parent | b2d45654220503224aa94e78cdff19ec624e9342 (diff) | |
download | ffmpeg-bdb2e80e88e76cc39c6d85a8f1c1712d36e18966.tar.gz |
Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342'
* commit 'b2d45654220503224aa94e78cdff19ec624e9342':
avresample: Add avresample_get_out_samples
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 d865ad2d23..0431badf5e 100644 --- a/libavresample/version.h +++ b/libavresample/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVRESAMPLE_VERSION_MAJOR 1 -#define LIBAVRESAMPLE_VERSION_MINOR 2 +#define LIBAVRESAMPLE_VERSION_MINOR 3 #define LIBAVRESAMPLE_VERSION_MICRO 0 #define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \ |