Changeset 7a7b77e6 in ffmpeg

Timestamp:
Feb 17, 2015, 9:39:32 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
62aec0c2
Parents:
3d5c0ba8 (diff), 31dc73e (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 '31dc73e92a96f08d07650c0e7d31c0b9a1465d46'

Conflicts:

libavcodec/vorbisdec.c

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

(No files)

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