ffmpeg/tests/ref/lavf
Michael Niedermayer 78accb876c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ffmpeg: fix some indentation
  ffmpeg: fix operation with --disable-avfilter
  simple_idct: remove disabled code
  motion_est: remove disabled code
  vc1: remove disabled code
  fate: separate lavf-mxf_d10 test from lavf-mxf
  cabac: Move code only used in the cabac test program to cabac.c.
  ffplay: warn that -pix_fmt is no longer working, suggest alternative
  ffplay: warn that -s is no longer working, suggest alternative
  lavf: rename enc variable in utils.c:has_codec_parameters()
  lavf: use designated initialisers for all (de)muxers.
  wav: remove a use of deprecated AV_METADATA_ macro
  rmdec: remove useless ap parameter from rm_read_header_old()
  dct-test: remove write-only variable
  des: fix #if conditional around P_shuffle
  Use LOCAL_ALIGNED in ff_check_alignment()

Conflicts:
	ffmpeg.c
	libavformat/avidec.c
	libavformat/matroskaenc.c
	libavformat/mp3enc.c
	libavformat/oggenc.c
	libavformat/utils.c
	tests/ref/lavf/mxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-17 20:12:02 +02:00
..
aiff
alaw
asf
au
avi
bmp
dv_fmt
ffm lavf: deprecate AVStream.quality. 2011-07-06 20:10:41 +02:00
flv_fmt
gif ffmpeg: deprecate loop_input and loop_output options 2011-07-08 19:58:19 +02:00
gxf
jpg
mkv
mmf
mov
mpg
mulaw
mxf Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mxf_d10 Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
nut
ogg
pbmpipe
pcx
pgm
pgmpipe
pixfmt regtests/sws: update checksums for recent changes 2011-07-11 03:54:30 +02:00
png
ppm
ppmpipe
rm
sgi
swf
tga
tiff
ts Merge commit 'b5849f77095439e994b11c25e6063d443b36c228' 2011-07-14 02:24:10 +02:00
voc
voc_s16
wav
yuv4mpeg