Changeset d784d6b7 in ffmpeg

Timestamp:
Jun 10, 2015, 6:50:36 PM (9 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
21d8e2c0
Parents:
88679aeb (diff), c6aa0554 (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 'c6aa0554b0c3e31fec4580b68ea85b66966cd381'

Conflicts:

libavcodec/mpegvideo.c

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.