diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 17:48:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 17:48:45 +0100 |
| commit | 15b2ec57ccaee49e8ec6de93d0ad7055da282e4d (patch) | |
| tree | 28f51a97013c69fa1b1e3e5559a0bb5cfe4ec4b1 /libavformat/version.h | |
| parent | 1d19f1b196c70cf2bd17d486e833bfa257314ef0 (diff) | |
| parent | be4edda6731a341d3fdeaa0e57753dc396790362 (diff) | |
| download | ffmpeg-15b2ec57ccaee49e8ec6de93d0ad7055da282e4d.tar.gz | |
Merge commit 'be4edda6731a341d3fdeaa0e57753dc396790362'
* commit 'be4edda6731a341d3fdeaa0e57753dc396790362':
http: Expose the content location via an AVOption
Conflicts:
libavformat/http.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
| -rw-r--r-- | libavformat/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index a27dce3aae..871cef794a 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MINOR 21 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |