Changeset 0f69f02e in ffmpeg

Timestamp:

May 31, 2015, 11:30:01 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

63fdedc7

Parents:

0aba7192 (diff), 149fa0b7 (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 '149fa0b7ac180fe1df48a2e379c560813555bf57'

• commit '149fa0b7ac180fe1df48a2e379c560813555bf57': mpegvideo: Move MotionEstContext and function declarations to a separate header

Conflicts:

libavcodec/mpegvideo.h

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

(No files)