Changeset 560eb717 in ffmpeg

Timestamp:
Feb 19, 2015, 7:39:04 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
841e9f43
Parents:
e3755119 (diff), 31d2039c (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 '31d2039cb42668ebcf08248bc48bbad44aa05f49'

Conflicts:

libavcodec/h264_parser.c
libavcodec/version.h

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

(No files)

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