Changeset 571effb3 in ffmpeg

Timestamp:
Jun 1, 2014, 3:39:21 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
3d820ba9
Parents:
909dbb0 (diff), 3df0d200 (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 '3df0d20028cb9d2daca16ac0dc6c3ab77183da37'

Conflicts:

libavcodec/ivi_common.c

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

(No files)

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