Changeset dc226c02 in ffmpeg

Timestamp:

Mar 17, 2014, 12:31:28 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3e3b0b3

Parents:

329a3286 (diff), 7245a0ae (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 '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2'

• commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2': mpegvideo: remove h264-only fields

Conflicts:

libavcodec/mpegvideo.h

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

(No files)