* qatar/master:
fate: fix partial run when no samples path is specified
ARM: NEON fixed-point forward MDCT
ARM: NEON fixed-point FFT
lavf: bump minor version and add an APIChanges entry for avio changes
avio: simplify url_open_dyn_buf_internal by using avio_alloc_context()
avio: make url_fdopen internal.
avio: make url_open_dyn_packet_buf internal.
avio: avio_ prefix for url_close_dyn_buf
avio: avio_ prefix for url_open_dyn_buf
avio: introduce an AVIOContext.seekable field
ac3enc: use generic fixed-point mdct
lavfi: add fade filter
Change yadif to not use out of picture lines.
lavc: deprecate AVCodecContext.antialias_algo
lavc: mark mb_qmin/mb_qmax for removal on next major bump.
Conflicts:
doc/filters.texi
libavcodec/ac3enc_fixed.h
libavcodec/ac3enc_float.h
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/vf_fade.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* newdev/master:
rtsp: Use GET_PARAMETER for keep-alive for generic RTSP servers
mlp_parse.c: set AVCodecContext channel_layout
APIChanges: mark the place where 0.6 was branched.
avio: make get_checksum() internal.
avio: move ff_crc04C11DB7_update() from avio.h -> avio_internal.h
avio: make init_checksum() internal.
NOT MERGED Add MxPEG decoder
NOT MERGED Add support for picture_ptr field in MJpegDecodeContext
NOT MERGED Move MJPEG's input buffer preprocessing in separate public function
NOT MERGED Support reference picture defined by bitmask in MJPEG's SOS decoder
sndio bug fix
Merged-by: Michael Niedermayer <michaelni@gmx.at>
In the name of consistency:
put_byte -> avio_w8
put_<type> -> avio_w<type>
put_buffer -> avio_write
put_nbyte will be made private
put_tag will be merged with avio_put_str
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
AVFormatContext * in input rather than a NUTContext *, which allows to
log messages with av_log().
Originally committed as revision 23431 to svn://svn.ffmpeg.org/ffmpeg/trunk
CC libavformat/nutdec.o
libavformat/nutdec.c: In function ‘read_seek’:
libavformat/nutdec.c:862: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
libavformat/nutdec.c:871: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
libavformat/nutdec.c:879: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
CC libavformat/nutenc.o
libavformat/nutenc.c: In function ‘write_packet’:
libavformat/nutenc.c:680: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
Originally committed as revision 22707 to svn://svn.ffmpeg.org/ffmpeg/trunk
Patch by Anton Khirnov (wyskas, do no evil mail)
Thread "[PATCH] nut metadata conversion table"
Originally committed as revision 22015 to svn://svn.ffmpeg.org/ffmpeg/trunk
This is only a straight conversion of current code, so for now, it won't
mux generic metadata. It will only mux Title, Author and Copyright.
Originally committed as revision 17653 to svn://svn.ffmpeg.org/ffmpeg/trunk
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me
Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
