Changeset 3ddf9b5b in ffmpeg

Timestamp:

Mar 17, 2014, 3:35:48 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3dab9e80

Parents:

b73aae6f (diff), 75af13a0 (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> (03/17/14 03:34:21)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/17/14 03:35:48)

Message:

Merge commit '75af13a'

• commit '75af13a': mpegvideo: directly use frames in ff_draw_horiz_band()

Conflicts:

libavcodec/mpegvideo.c

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

(No files)