diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-08 03:49:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-08 03:49:12 +0200 |
| commit | c71f8d40beb3badaebafa69458ce674cf46bb001 (patch) | |
| tree | 3f5bd18737be39dbc722683867b66dc3c151cb47 /libavutil/version.h | |
| parent | 9e5867743828c15773fedafe17a3126eb864a523 (diff) | |
| parent | 9b60d907ae6d203e8e7877d7e8d357f7731eb4e9 (diff) | |
| download | ffmpeg-c71f8d40beb3badaebafa69458ce674cf46bb001.tar.gz | |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavc: use av_fifo_freep
lavf: use av_fifo_freep
ffmpeg: use av_fifo_freep
lavd/jack_audio: use av_fifo_freep
lavfi: use av_fifo_freep
lavu/fifo: add av_fifo_freep function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
| -rw-r--r-- | libavutil/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index 3cb5b66666..a430c6b948 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,7 +56,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 81 +#define LIBAVUTIL_VERSION_MINOR 82 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |