diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-31 01:14:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-31 02:46:26 +0100 |
| commit | 151ecc2aecd81718e2520936dd3c537d7e6fe2fc (patch) | |
| tree | d30c9048773a1138a4567fead3fd2c440db745bc /doc/APIchanges | |
| parent | b8c16558828e73e933ae73b5888345d50e897dfc (diff) | |
| parent | d7edd359ec28142120eb7fde77b775309b6038d8 (diff) | |
| download | ffmpeg-151ecc2aecd81718e2520936dd3c537d7e6fe2fc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (26 commits)
avconv: deprecate the -deinterlace option
doc: Fix the name of the new function
aacenc: make sure to encode enough frames to cover all input samples.
aacenc: only use the number of input samples provided by the user.
wmadec: Verify bitstream size makes sense before calling init_get_bits.
kmvc: Log into a context at a log level constant.
mpeg12: Pad framerate tab to 16 entries.
kgv1dec: Increase offsets array size so it is large enough.
kmvc: Check palsize.
nsvdec: Propagate errors
nsvdec: Be more careful with av_malloc().
nsvdec: Fix use of uninitialized streams.
movenc: cosmetics: Get rid of camelCase identifiers
swscale: more generic check for planar destination formats with alpha
doc: Document mov/mp4 fragmentation options
build: Use order-only prerequisites for creating FATE reference file dirs.
x86 dsputil: provide SSE2/SSSE3 versions of bswap_buf
rtsp: Remove some unused variables from ff_rtsp_connect().
avutil: make intfloat api public
avformat_write_header(): detail error message
...
Conflicts:
doc/APIchanges
doc/ffmpeg.texi
doc/muxers.texi
ffmpeg.c
libavcodec/kmvc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_yasm.asm
libavcodec/x86/pngdsp-init.c
libavformat/movenc.c
libavformat/movenc.h
libavformat/mpegtsenc.c
libavformat/nsvdec.c
libavformat/utils.c
libavutil/avutil.h
libswscale/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/APIchanges')
| -rw-r--r-- | doc/APIchanges | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 62dc796e41..3c5fe68921 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -16,6 +16,10 @@ API changes, most recent first: 2012-01-24 - xxxxxxx - lavfi 2.60.100 Add avfilter_graph_dump. +2012-01-30 - xxxxxxx - lavu 51.22.0 - intfloat.h + Add a new installed header libavutil/intfloat.h with int/float punning + functions. + 2012-01-25 - lavf 53.22.0 f1caf01 Allow doing av_write_frame(ctx, NULL) for flushing possible buffered data within a muxer. Added AVFMT_ALLOW_FLUSH for @@ -109,7 +113,7 @@ API changes, most recent first: Add av_toupper()/av_tolower() 2011-11-05 - b6d08f4 - lavf 53.13.0 - Add avformat_network_init()/avformat_network_uninit() + Add avformat_network_init()/avformat_network_deinit() 2011-10-27 - 512557b - lavc 53.15.0 Remove avcodec_parse_frame. |