Changeset 58f63670 in ffmpeg

Timestamp:

Jun 12, 2015, 6:47:14 PM (9 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

218f58a1

Parents:

c39637f (diff), 8b5007a3 (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 '8b5007a31b8d1ddbe3661bf45a732336450b7d25'

• commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25': mpegvideo: Move ER functions to a separate file

Conflicts:

libavcodec/mpegvideo.c

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

(No files)