Changeset adaba6a1 in ffmpeg

Timestamp:
Mar 4, 2014, 9:01:24 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
309171be
Parents:
4a59994e (diff), 4c41a7a1 (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 '4c41a7a1798dd6c60e40f79be12faa98a9347151'

Conflicts:

libavfilter/vf_frei0r.c

No change as the token parsing change was not merged

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

(No files)

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