Changeset 1e5656bf in ffmpeg

Timestamp:
Feb 10, 2014, 11:39:55 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
919791f
Parents:
6732f43 (diff), b5f851ed (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 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f'

Conflicts:

tests/lavf-regression.sh

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

(No files)

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