FFmpeg/libswscale
Michael Niedermayer 0cfbfaaa12 Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'
* commit '7b89cd20d844cbe763ca34e63e99d110043cf241':
  eamad: allocate a dummy reference frame when the real one is missing
  Replace remaining includes of audioconvert.h with channel_layout.h
  Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 15:44:15 +01:00
..
bfin
ppc
sparc
x86
colorspace-test.c
input.c
libswscale.v
Makefile
options.c
output.c
rgb2rgb_template.c
rgb2rgb.c
rgb2rgb.h
swscale_internal.h
swscale_unscaled.c Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241' 2013-03-12 15:44:15 +01:00
swscale-test.c
swscale.c
swscale.h
utils.c
version.h
yuv2rgb.c