Changeset d6d3cfb0 in ffmpeg

Timestamp:

Mar 22, 2014, 9:17:54 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

672c610d

Parents:

8fbc6e59 (diff), 600b854a (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 '600b854ad8173995518bd917e7f86120b5505088'

• commit '600b854ad8173995518bd917e7f86120b5505088': imgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil

Conflicts:

libavcodec/imgconvert.c
libavcodec/x86/dsputil_x86.h

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

(No files)