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

libmpcodecs/av_helpers: update to latest version from mplayer

2013-02-05 13:43:35 +01:00

cpudetect.h

libmpcodecs/cpudetect: update to latest from mplayer

2013-02-05 12:55:10 +01:00

img_format.c

libmpcodecs: update img_format.* & mp_image.* to latest from mplayer

2013-02-05 03:30:17 +01:00

img_format.h

libmpcodecs: update img_format.* & mp_image.* to latest from mplayer

2013-02-05 03:30:17 +01:00

mp_image.c

vf_mp: Set pseudo pal

2013-02-23 19:32:24 +01:00

mp_image.h

vf_mp: Set pseudo pal

2013-02-23 19:32:24 +01:00

mp_msg.h

libhmpcodec/mp_msg: update to latest from mplayer

2013-02-05 13:02:28 +01:00

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

libmpcodecs/vf_fspp: update to latest version from mplayer

2013-02-05 13:44:53 +01:00

vf_ilpack.c

libmpcodecs/vf_ilpack: update to latest version from mplayer

2013-02-05 13:59:47 +01:00

vf_pp7.c

libmpcodecs/vf_pp7:update to latest version from mplayer

2013-02-05 14:17:28 +01:00

vf_softpulldown.c

…

vf_uspp.c

Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'

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

vf.h

…

vfcap.h

…