Changeset 96e6447d in ffmpeg

Timestamp:

Sep 17, 2013, 10:01:35 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7b83648

Parents:

22f79a2d (diff), 596e5d47 (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 '596e5d4783ca951258a7c580951fd161f1785ec1'

• commit '596e5d4783ca951258a7c580951fd161f1785ec1': lavf: Add a flag to enable/disable per-packet flushing

Conflicts:

libavformat/avformat.h
libavformat/mux.c
libavformat/version.h

This adds a 2nd API to set per packet flushing
If the user application indicates through either a non default then this non default takes
precedence over the other still default value

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

(No files)