Changeset ae9a73de in ffmpeg

Timestamp:
Jun 30, 2014, 4:05:39 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
89bcb777
Parents:
0c911c8f (diff), 253d0be6 (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.
git-author:
Michael Niedermayer <michaelni@gmx.at> (06/30/14 15:58:51)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/30/14 16:05:39)
Message:

Merge commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772'

Conflicts:

libavcodec/pgssubdec.c

Some of this has been split out and commited in cleanly split patches immedeately
before this merge

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

(No files)

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