Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Nov 2013 22:48:16 +0000 (23:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Nov 2013 22:54:10 +0000 (23:54 +0100)
commit0ee905e243078cd4dfb3afa32777129aeee3bddb
tree78bafb0b5626836d18d158139b71d0e6b73780a2
parent571a99de186eac69ed0d6b0eaaaa983cae30765a
parent5b9c3b4505206143d85398c1410949319fa1180f
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>
27 files changed:
doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
ffplay.c
libavcodec/avuienc.c
libavcodec/ffv1.c
libavcodec/libopenjpegenc.c
libavcodec/libtheoraenc.c
libavcodec/libutvideodec.cpp
libavcodec/libutvideoenc.cpp
libavcodec/libvpxenc.c
libavcodec/proresenc_anatoliy.c
libavcodec/proresenc_kostya.c
libavcodec/r210enc.c
libavcodec/svq1dec.c
libavcodec/utils.c
libavcodec/utvideoenc.c
libavcodec/v210enc.c
libavcodec/v308enc.c
libavcodec/v408enc.c
libavcodec/v410enc.c
libavcodec/xfaceenc.c
libavcodec/y41penc.c
libavcodec/yuv4enc.c
libavfilter/lavfutils.c
libavfilter/libmpcodecs/vf_uspp.c
libavformat/utils.c