1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
FFmpeg/tests/ref/lavf
Michael Niedermayer d7e5aebae7 Merge remote branch 'qatar/master'
* qatar/master: (23 commits)
  ac3enc: correct the flipped sign in the ac3_fixed encoder
  Eliminate pointless '#if 1' statements without matching '#else'.
  Add AVX FFT implementation.
  Increase alignment of av_malloc() as needed by AVX ASM.
  Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
  documentation: extend documentation for ffmpeg -aspect option
  APIChanges: update commit hashes for recent additions.
  lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
  aac: add headers needed for log2f()
  lavc: remove FF_API_MB_Q cruft
  lavc: remove FF_API_RATE_EMU cruft
  lavc: remove FF_API_HURRY_UP cruft
  pad: make the filter parametric
  vsrc_movie: add key_frame and pict_type.
  vsrc_movie: fix leak in request_frame()
  lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
  vsrc_buffer: add sample_aspect_ratio fields to arguments.
  lavfi: add fieldorder filter
  scale: make the filter parametric
  ...

Conflicts:
	Changelog
	doc/filters.texi
	ffmpeg.c
	libavcodec/ac3dec.h
	libavcodec/dsputil.c
	libavfilter/avfilter.h
	libavfilter/vf_scale.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-27 03:51:04 +02:00
..
aiff
alaw
asf
au
avi lavf/utils.c: Order packets with identical PTS by stream index. 2011-04-12 19:06:26 -04:00
bmp
dv_fmt
ffm
flv_fmt
gif
gxf lavf/utils.c: Order packets with identical PTS by stream index. 2011-04-12 19:06:26 -04:00
jpg
mkv
mmf
mov In mov muxer, compute avg bitrate in esds 2011-04-16 16:19:10 -07:00
mpg lavf/utils.c: Order packets with identical PTS by stream index. 2011-04-12 19:06:26 -04:00
mulaw
mxf 10l, commit that should have been stashed into the merge. 2011-04-17 23:59:00 +02:00
nut lavf/utils.c: Order packets with identical PTS by stream index. 2011-04-12 19:06:26 -04:00
ogg
pbmpipe
pcx
pgm
pgmpipe
pixfmt Fix yuvj420p scaling artefact, issue1108. 2011-04-03 16:40:11 +02:00
png
ppm
ppmpipe
rm ac3enc: correct the flipped sign in the ac3_fixed encoder 2011-04-26 17:19:37 -04:00
sgi
swf
tga
tiff
ts 10l, commit that should have been stashed into the merge. 2011-04-17 23:59:00 +02:00
voc
voc_s16 Add regression test for stereo s16le in voc. 2011-01-19 12:51:42 +00:00
wav
yuv4mpeg