diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-22 23:54:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-22 23:54:34 +0100 |
| commit | db4a2976f6afb6ac16bdd455695dcc277a03416d (patch) | |
| tree | 4beb864664ddb62d9a6b56dbb6ea9609f2772222 /libavformat/version.h | |
| parent | 0a32a1b4bbcdffe5c6a61a9e8ea64a17bf31f172 (diff) | |
| parent | c99915f7c74ce1249d8633cb6fd09035b8d84db7 (diff) | |
| download | ffmpeg-db4a2976f6afb6ac16bdd455695dcc277a03416d.tar.gz | |
Merge commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7'
* commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7':
rtpdec: DV depacketizer (RFC 6469)
Conflicts:
Changelog
libavformat/Makefile
libavformat/rtpdec_dv.c
libavformat/version.h
See: cbe508553ad17b277d4cb6f12f61aac4f52908b8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
| -rw-r--r-- | libavformat/version.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index 263465e5ad..c23ce57d75 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,9 +30,8 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 56 - #define LIBAVFORMAT_VERSION_MINOR 23 -#define LIBAVFORMAT_VERSION_MICRO 103 +#define LIBAVFORMAT_VERSION_MICRO 104 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |