Changeset 595ba3b9 in ffmpeg

Timestamp:

Mar 24, 2014, 12:41:49 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

83e89787

Parents:

bd34e26b (diff), 25b32586 (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 '25b32586566f285d797737863c97a1c5c9c84e2b'

• commit '25b32586566f285d797737863c97a1c5c9c84e2b': lavf: add an AVStream field for exporting stream-global side data

Conflicts:

libavformat/utils.c
libavformat/version.h

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

(No files)