diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-17 15:01:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-17 15:16:23 +0200 |
| commit | d8cfa983580402787e06093da8d242cd92a74428 (patch) | |
| tree | 484b8dbae1394060809c151944501773891948ad /libavformat | |
| parent | c079da5073167b5e7e959af12ef157e71bde0015 (diff) | |
| parent | 58b619c8a226cc4564ad5af291bc99a04f89ee56 (diff) | |
Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'
* commit '58b619c8a226cc4564ad5af291bc99a04f89ee56':
wav muxer: write metadata
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/version.h | 4 | ||||
| -rw-r--r-- | libavformat/wav.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index c757fdd07b..749b9e0d85 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 32 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MINOR 33 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ diff --git a/libavformat/wav.c b/libavformat/wav.c index f58bcb32ad..6ede11fb9a 100644 --- a/libavformat/wav.c +++ b/libavformat/wav.c @@ -143,6 +143,9 @@ static int wav_write_header(AVFormatContext *s) wav->maxpts = wav->last_duration = 0; wav->minpts = INT64_MAX; + /* info header */ + ff_riff_write_info(s); + /* data header */ wav->data = ff_start_tag(pb, "data"); |