Changeset e5bae39f in ffmpeg

Timestamp:
Jul 20, 2015, 10:54:42 PM (9 years ago)
Author:
Michael Niedermayer <michael@niedermayer.cc>
Branches:
master
Children:
809780ca
Parents:
b1fad7ac (diff), 5d3addb (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 '5d3addb937946eca5391e40b5e6308e74ac6f77b'

Conflicts:

doc/APIchanges
ffmpeg.c
libavcodec/avcodec.h
libavcodec/mpegvideo_enc.c
libavcodec/version.h

Merged-by: Michael Niedermayer <​michael@niedermayer.cc>

(No files)

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