Changeset 5440151f in ffmpeg

Timestamp:

Apr 5, 2014, 4:54:15 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

874f27a8

Parents:

a1ac12bd (diff), 3dc6272b (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (04/05/14 16:48:42)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/05/14 16:54:15)

Message:

Merge commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d'

• commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d': Remove a number of unnecessary dsputil.h #includes

Conflicts:

libavcodec/h264pred.c
libavcodec/vc1dsp.c

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

(No files)