Changeset 0960cc4c in ffmpeg

Timestamp:

Nov 9, 2014, 11:57:41 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d99653c9

Parents:

b546023b (diff), e3e317e0 (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 'e3e317e0c015b164b6c2eb8913e393216d78de23'

• commit 'e3e317e0c015b164b6c2eb8913e393216d78de23': lavc: Compact the side-data passthrough

Conflicts:

libavcodec/utils.c

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

(No files)