* 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
Showing the changes to doc/APIchanges (1 of 25 files). Show all
Unified · Split
| @@ -16,6 +16,10 @@ API changes, most recent first: · 15 unmodified lines | ||
| 16 | 16 | 2012-01-24 - xxxxxxx - lavfi 2.60.100 |
| 17 | 17 | Add avfilter_graph_dump. |
| 18 | 18 | |
| 19 | +2012-01-30 - xxxxxxx - lavu 51.22.0 - intfloat.h | |
| 20 | + Add a new installed header libavutil/intfloat.h with int/float punning | |
| 21 | + functions. | |
| 22 | + | |
| 19 | 23 | 2012-01-25 - lavf 53.22.0 |
| 20 | 24 | f1caf01 Allow doing av_write_frame(ctx, NULL) for flushing possible |
| 21 | 25 | buffered data within a muxer. Added AVFMT_ALLOW_FLUSH for |
| @@ -109,7 +113,7 @@ API changes, most recent first: · 87 unmodified lines | ||
| 109 | 113 | Add av_toupper()/av_tolower() |
| 110 | 114 | |
| 111 | 115 | 2011-11-05 - b6d08f4 - lavf 53.13.0 |
| 112 | − Add avformat_network_init()/avformat_network_uninit() | |
| 116 | + Add avformat_network_init()/avformat_network_deinit() | |
| 113 | 117 | |
| 114 | 118 | 2011-10-27 - 512557b - lavc 53.15.0 |
| 115 | 119 | Remove avcodec_parse_frame. |