Michael Niedermayer 0ee905e243 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>

2013-11-16 23:54:10 +01:00

..

libvo

…

av_helpers.h

…

cpudetect.h

…

img_format.c

…

img_format.h

…

mp_image.c

…

mp_image.h

…

mp_msg.h

…

mpc_info.h

…

vf_eq2.c

…

vf_eq.c

avfilter/libmpcodecs/vf_eq: remove useless storage class specifier in empty declaration

2013-10-24 07:44:23 +00:00

vf_fspp.c

…

vf_ilpack.c

…

vf_pp7.c

…

vf_softpulldown.c

…

vf_uspp.c

Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'

2013-11-16 23:54:10 +01:00

vf.h

…

vfcap.h

…