Changeset bb5ef961 in ffmpeg

Timestamp:

Aug 6, 2013, 7:35:03 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

84bc3170

Parents:

a59a64cb (diff), 3799376d (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 commit '3799376dd3373ee255651ed542c75b15665801a8'

• commit '3799376dd3373ee255651ed542c75b15665801a8': lavfi/fifo: fix flushing when using request_samples

Conflicts:

libavfilter/fifo.c

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

(No files)