Changeset 329a3286 in ffmpeg

Timestamp:

Mar 17, 2014, 12:23:48 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

dc226c02

Parents:

29be9b53 (diff), be039278 (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 'be039278b5ebd8075d90a3508db2aed5adf59e02'

• commit 'be039278b5ebd8075d90a3508db2aed5adf59e02': mpegvideo: move ff_draw_horiz_band() to mpegutils.c

Conflicts:

libavcodec/Makefile

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

(No files)