Changeset 094a4968 in ffmpeg

Timestamp:

Aug 26, 2011, 9:18:54 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

adfe5940

Parents:

0a1cf662 (diff), 1717ba0c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: fifo: add FIFO API test program, and fate test fifo: add av_fifo_peek2(), and deprecate av_fifo_peek() postprocess.c: filter name needs to be double 0 terminated doxygen: fix wrong comment syntax, < vs. /< doxygen: drop pointless star from pointer variable names Replace deprecated av_find_stream_info() by avformat_find_stream_info(). xmv: eliminate superfluous zeroing of zero data configure: fix typo in avconv dependency list

Conflicts:

configure
doc/APIchanges
libavutil/Makefile
libavutil/avutil.h

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)