1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
FFmpeg/tests/ref/lavf
Michael Niedermayer 8e576d5830 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libavutil: add utility functions to simplify allocation of audio buffers.
  libavutil: add planar sample formats and av_sample_fmt_is_planar()
  avconv: fix segfault at EOF with delayed pictures
  pcmdec: remove unneeded resetting of samples pointer
  avconv: remove a now unused parameter from output_packet().
  avconv: formatting fixes in output_packet()
  avconv: declare some variables in blocks where they are used
  avconv: use the same behavior when decoding audio/video/subs
  bethsoftvideo: return proper consumed size for palette packets.
  cdg: skip packets that don't contain a cdg command.
  crcenc: add flags
  avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.
  tiffenc: add a private option for selecting compression algorithm
  md5enc: add flags
  ARM: remove needless .text/.align directives

Conflicts:
	doc/APIchanges
	libavcodec/tiffenc.c
	libavutil/avutil.h
	libavutil/samplefmt.c
	libavutil/samplefmt.h
	tests/ref/fate/bethsoft-vid
	tests/ref/fate/cdgraphics
	tests/ref/fate/film-cvid-pcm-stereo-8bit
	tests/ref/fate/mpeg2-field-enc
	tests/ref/fate/nuv
	tests/ref/fate/tiertex-seq
	tests/ref/fate/tscc-32bit
	tests/ref/fate/vmnc-32bit

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-24 03:32:24 +01:00
..
aiff
alaw
asf
au
avi
bmp
dv_fmt rematrix: dont use floats for int16 code. 2011-09-19 09:25:50 +02:00
ffm Merge remote-tracking branch 'qatar/master' 2011-09-07 22:58:39 +02:00
flv_fmt
gif
gxf ffmpeg: fix video synchronization code to be exact on constant fps videos. Fixes Ticket137 2011-09-13 17:29:23 +02:00
jpg
mkv
mmf
mov Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
mpg
mulaw
mxf
mxf_d10 rematrix: dont use floats for int16 code. 2011-09-19 09:25:50 +02:00
nut
ogg Replace vendor string in Ogg and FLAC muxers. 2011-11-02 10:43:39 +01:00
pbmpipe
pcx
pgm
pgmpipe
pixfmt
png
ppm
ppmpipe
rm
sgi
swf
tga
tiff
ts Merge remote-tracking branch 'qatar/master' 2011-11-19 02:00:06 +01:00
voc
voc_s16
wav riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 2011-10-14 13:28:58 +02:00
yuv4mpeg