Changeset 8c87658 in ffmpeg

Timestamp:
Nov 26, 2013, 11:37:20 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
cd51d9a9
Parents:
ac021fdc (diff), a16577d9 (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 'a16577d9857206089fd8bce6a342b31dbd7fb9b0'

Conflicts:

libavformat/riff.c

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.