diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-16 01:32:52 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-16 01:32:52 +0200 |
commit | fbe02459dc4f3c8f4d758c1a90ed8e35a800f3b9 (patch) | |
tree | 66263011ff0784ce9a33b697a117516de48401fa /doc | |
parent | 9a1963fbb872f08222a5b73fe96931708ca32732 (diff) | |
parent | b4675d0fbf6606ab737e81c3c0fe6a05c8764334 (diff) | |
download | ffmpeg-fbe02459dc4f3c8f4d758c1a90ed8e35a800f3b9.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Check for CommandLineToArgvW
vc1dec: Do not use random pred_flag if motion vector data is skipped
vp8: Enclose pthread function calls in ifdefs
snow: refactor code to work around a compiler bug in MSVC.
vp8: Include the thread headers before using the pthread types
configure: Check for getaddrinfo in ws2tcpip.h, too
vp8: implement sliced threading
vp8: move data from VP8Context->VP8Macroblock
vp8: refactor decoding a single mb_row
doc: update api changes with the right commit hashes
mem: introduce av_malloc_array and av_mallocz_array
Conflicts:
configure
doc/APIchanges
libavcodec/vp8.c
libavutil/mem.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/APIchanges | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index de05198770..a2f4e03d5e 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -57,29 +57,32 @@ API changes, most recent first: 2012-03-26 - a67d9cf - lavfi 2.66.100 Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions. -2012-06-22 - xxxxxxx - lavu 51.34.0 +2012-07-10 - 5fade8a - lavu 51.37.0 + Add av_malloc_array() and av_mallocz_array() + +2012-06-22 - d3d3a32 - lavu 51.34.0 Add av_usleep() 2012-06-20 - ae0a301 - lavu 51.33.0 Move av_gettime() to libavutil, add libavutil/time.h -2012-xx-xx - xxxxxxx - lavr 0.0.3 +2012-06-09 - 3971be0 - lavr 0.0.3 Add a parameter to avresample_build_matrix() for Dolby/DPLII downmixing. -2012-xx-xx - xxxxxxx - lavfi 2.23.0 - avfilter.h +2012-06-12 - 9baeff9 - lavfi 2.23.0 - avfilter.h Add AVFilterContext.nb_inputs/outputs. Deprecate AVFilterContext.input/output_count. -2012-xx-xx - xxxxxxx - lavfi 2.22.0 - avfilter.h +2012-06-12 - 84b9fbe - lavfi 2.22.0 - avfilter.h Add avfilter_pad_get_type() and avfilter_pad_get_name(). Those should now be used instead of accessing AVFilterPad members directly. -2012-xx-xx - xxxxxxx - lavu 51.32.0 - audioconvert.h +2012-06-12 - b0f0dfc - lavu 51.32.0 - audioconvert.h Add av_get_channel_layout_channel_index(), av_get_channel_name() and av_channel_layout_extract_channel(). -2012-05-25 - e0e0793 - lavu 51.31.0 - opt.h +2012-05-25 - 154486f - lavu 51.31.0 - opt.h Add av_opt_set_bin() 2012-05-15 - lavfi 2.17.0 |