Changeset 5a15bd6f in ffmpeg

Timestamp:

Dec 11, 2013, 10:49:44 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

efb5ebe8

Parents:

27e79779 (diff), 84f13192 (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 '84f131921ffb43d8070d5680e91f6a24d66ccac4'

• commit '84f131921ffb43d8070d5680e91f6a24d66ccac4': avplay: do not call avcodec_get_frame_defaults().

Conflicts:

ffplay.c

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

(No files)