Changeset 9d6a27d5 in ffmpeg

Timestamp:

Mar 22, 2014, 10:26:23 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

de182701

Parents:

74fed968 (diff), 57f09608 (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 '57f09608e1600d1cf1679885a46f5004d522d68f'

• commit '57f09608e1600d1cf1679885a46f5004d522d68f': dsputil: Move thirdpel-related bits into their own context

Conflicts:

libavcodec/svq3.c

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

(No files)