ffmpeg/mxf at 905c4dc2b0d564e1b9b6bc6eeca0b8915b81cd8c - ffmpeg - Atria-soft GIT

generic-library/ffmpeg

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

3 lines

136 B

Plaintext

Raw Blame History

	`785e38ddd2466046f30aa36399b8f8fa *./tests/data/lavf/lavf.mxf`
	`525881 ./tests/data/lavf/lavf.mxf`
	`./tests/data/lavf/lavf.mxf CRC=0x4ace0849`