Changeset 0ee905e2 in ffmpeg

Timestamp:

Nov 16, 2013, 10:54:10 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

29c83d23

Parents:

571a99de (diff), 5b9c3b45 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (11/16/13 22:48:16)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/16/13 22:54:10)

Message:

Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'

• commit '5b9c3b4505206143d85398c1410949319fa1180f': Replace all instances of avcodec_alloc_frame() with av_frame_alloc().

Conflicts:

doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
libavcodec/alacenc.c
libavcodec/libopenjpegenc.c
libavcodec/libvpxenc.c
libavcodec/pcm.c
libavcodec/xbmenc.c
libavcodec/xwdenc.c
libavformat/utils.c

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

(No files)