Changeset 4b4a7fcb in ffmpeg

Timestamp:
Nov 4, 2013, 8:52:46 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
b1f213a8
Parents:
2865c1b (diff), e7399695 (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 'e73996954d8e00117056dcefb38ef3d4d2f37967'

Conflicts:

libavfilter/filtfmts.c

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

(No files)

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