Changeset 8ba683e6 in ffmpeg

Timestamp:
Sep 3, 2013, 11:44:44 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
164b67ca
Parents:
92b7e7b3 (diff), 8aba7968 (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> (09/03/13 11:17:20)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (09/03/13 11:44:44)
Message:

Merge commit '8aba7968dd604aae91ee42cbce0be3dad7dceb30'

Conflicts:

libavcodec/vcr1.c

See: 845724c82c1a732ab398c9e8cedd178f96f1626d
See: 8e09482e4d27d65bbce2ce5c2f4392216011ed09
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)

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