Changeset f0fbd910 in ffmpeg

Timestamp:

Jun 16, 2014, 10:54:36 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

60058c18

Parents:

7b7afaf8 (diff), 711aa2a8 (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 '711aa2a82727907f778fb8aa9a93aff2120170f2'

• commit '711aa2a82727907f778fb8aa9a93aff2120170f2': lavf: dump stream side data when probing

Conflicts:

libavformat/dump.c

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

(No files)