Changeset 4177f501 in ffmpeg

Timestamp:
Feb 14, 2015, 7:29:34 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
088dfd3f
Parents:
3eec775b (diff), 7769be59 (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 '7769be590c7aeb2aad26ca723d105cf5203e33d2'

Conflicts:

libavcodec/vp56.c

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

(No files)

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