Changeset 15f8941 in ffmpeg

Timestamp:

Jun 14, 2012, 10:14:21 PM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

71529bd8

Parents:

01a14ce0 (diff), d246c18e (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (06/14/12 22:09:39)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/14/12 22:14:21)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: Avoid C99 variable declarations within for statements. rtmp: Read and handle incoming packets while writing data doc: document THREAD_TYPE fate variable rtpdec: Don't require frames to start with a Mode A packet avconv: don't try to free threads that were not initialized.

Conflicts:

doc/fate.texi
ffplay.c
libavdevice/dv1394.h

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

(No files)