Changeset 1fd0e9a5 in ffmpeg

Timestamp:

Jun 27, 2014, 5:24:44 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8c22bea5

Parents:

3ac51145 (diff), 5dd8c08f (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> (06/27/14 17:20:12)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/27/14 17:24:44)

Message:

Merge commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28'

• commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28': mpeg: Change ff_convert_matrix() to take an MpegEncContext parameter

Conflicts:

libavcodec/mpegvideo.h

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

(No files)