Changeset 153557df in ffmpeg

Timestamp:

Mar 13, 2014, 11:10:31 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

db94b144

Parents:

ea2bd139 (diff), 8199bb7b (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 '8199bb7be0db423bcbbd252d092386634fcf1d68'

• commit '8199bb7be0db423bcbbd252d092386634fcf1d68': dsputil.h: Clean up comments

Conflicts:

libavcodec/dsputil.h

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

(No files)