Changeset b3f90521 in ffmpeg

Timestamp:
May 28, 2014, 8:03:34 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
c1485afe
Parents:
c14045c8 (diff), 7dba055b (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 '7dba055bb0d31b2c79d9c3a66abb849a71417d3c'

Conflicts:

tests/ref/lavf/ogg

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

(No files)

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