diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-09 04:47:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-09 04:47:19 +0200 |
| commit | f9ecb849ef39bc337d9439b829fe08da5c95cc3d (patch) | |
| tree | 761e860a10084d8de4f07815911f697fe11610b9 /doc | |
| parent | 7b8ed831eb8432d202dad16dedc1758b018bb1fa (diff) | |
| parent | a71bcd1a7f66e210971c44452dc4cdae7bdbd98a (diff) | |
| download | ffmpeg-f9ecb849ef39bc337d9439b829fe08da5c95cc3d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
crypto: Use av_freep instead of av_free
lavf: don't try to free private options if priv_data is NULL.
swscale: fix types of assembly arguments.
swscale: move two macros that are only used once into caller.
swscale: remove unused function.
options: Add missing braces around struct initializer.
mov: Remove leftover crufty debug statement with references to a local file.
dvbsubdec: Fix compilation of debug code.
Remove all uses of now deprecated metadata functions.
Move metadata API from lavf to lavu.
Conflicts:
doc/APIchanges
libavformat/aiffdec.c
libavformat/asfdec.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/cafdec.c
libavformat/matroskaenc.c
libavformat/mov.c
libavformat/mp3enc.c
libavformat/wtv.c
libavutil/avutil.h
libavutil/internal.h
libswscale/swscale.c
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/APIchanges | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index feed58f75a..92ab57ecb8 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -50,6 +50,11 @@ API changes, most recent first: 2011-05-XX - XXXXXX - lavfi 2.6.0 - avcodec.h Add avfilter_get_video_buffer_ref_from_frame() to libavfilter/avcodec.h. +2011-06-xx - xxxxxxx - lavu 51.5.0 - AVMetadata + Move AVMetadata from lavf to lavu and rename it to + AVDictionary -- new installed header dict.h. + All av_metadata_* functions renamed to av_dict_*. + 2011-06-07 - a6703fa - lavu 51.4.0 - av_get_bytes_per_sample() Add av_get_bytes_per_sample() in libavutil/samplefmt.h. Deprecate av_get_bits_per_sample_fmt(). |