diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-21 23:53:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-21 23:53:39 +0200 |
| commit | 938adb7abcfb38ab8287e97847010479a116f78c (patch) | |
| tree | 36d0bee76f90de3f425df905f603f6875d969cbb /libavformat/version.h | |
| parent | faa2930f191099621e03c55cca32662467d3cc15 (diff) | |
| parent | 13a867a63e64c62a41b7aa31bc61ca91a5eb1cf6 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dwt: K&R prettyprinting cosmetics
Remove libnut wrapper
fate: change name of FATE samples location environment variable
avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps.
http: Factorize the code by adding http_read_header()
Conflicts:
configure
doc/APIchanges
doc/fate.texi
libavcodec/dwt.c
libavcodec/dwt.h
libavformat/Makefile
libavformat/avformat.h
libavformat/libnut.c
libavformat/matroskaenc.c
libavformat/utils.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
| -rw-r--r-- | libavformat/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index afc235c43c..1158fdf212 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,8 +30,8 @@ #include "libavutil/avutil.h" #define LIBAVFORMAT_VERSION_MAJOR 54 -#define LIBAVFORMAT_VERSION_MINOR 5 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MINOR 6 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |