Changeset b568eeba in ffmpeg

Timestamp:
Nov 3, 2013, 11:58:54 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
cf49d590
Parents:
b6413cdc (diff), 3ea5f64f (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 '3ea5f64ffff0a51f62922efd2e2bc231b13b2179'

Conflicts:

libavcodec/ansi.c

Only partially merged, ffmpeg is not affected by this.

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

(No files)

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