Changeset f2336668 in ffmpeg

Timestamp:

Jul 9, 2014, 9:34:33 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

19b9e07e

Parents:

57fa9e97 (diff), 650d3840 (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 '650d384048ed42579cc6d67bf32a94b468c0b6cb'

• commit '650d384048ed42579cc6d67bf32a94b468c0b6cb': yuv4mpegenc: do not access AVCodecContext.coded_frame

Conflicts:

libavformat/yuv4mpegenc.c

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

(No files)