diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-20 00:22:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-20 00:22:51 +0200 |
| commit | 6218831844fa5a517eda857adee7960aa0a9c033 (patch) | |
| tree | ef558092b7894d7f51b14af46203f17ddea49bb6 /libavutil/version.h | |
| parent | ab6228316a595ecc1ee462a34a4f19e1ffeb9062 (diff) | |
| parent | b9419b58826effc3d9afabd1a2e50d66391fbdbf (diff) | |
| download | ffmpeg-6218831844fa5a517eda857adee7960aa0a9c033.tar.gz | |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavf/ftp: favour EPSV over PASV command
lavf/audiointerleave: return more meaningful error codes
lavf/audiointerleave: check for allocation failure
lavf/audiointerleave: use av_fifo_alloc_array
lavf/dvenc: use av_fifo_alloc_array
lavc/flac_parser: use av_fifo_alloc_array
lavc/frame_thread_encoder: use av_fifo_alloc_array
lavfi/vf_fps: use av_fifo_alloc_array
lavfi/buffersink: use av_fifo_alloc_array
ffmpeg: use av_fifo_alloc_array
lavd/jack_audio: use av_fifo_alloc_array
lavu/fifo: add av_fifo_alloc_array 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 9eeba9abd9..b134615a5b 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,7 +56,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 85 +#define LIBAVUTIL_VERSION_MINOR 86 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |