1
0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-30 15:18:36 +00:00
ffmpeg/libavutil
Michael Niedermayer b4178a3f13 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rtmp: Support 'rtmp_live', an option which specifies if the media is a live stream.
  av_samples_fill_array: Mark unmodified function argument as const.
  lagarith: add YUY2 decoding support
  Support decoding unaligned rgb24 lagarith.
  dv: Split profile handling code into a separate file.
  flvenc: use AVFormatContext, not AVCodecContext for logging.
  mov: Remove write-only variable in mov_read_chan().
  fate: Change the probe-format refs to match the final text format committed.
  fate: Add avprobe as a make dependency
  Add probe fate tests to test for regressions in detecting media types.
  fate: Add oneline comparison method
  qdm2: clip array indices returned by qdm2_get_vlc().
  avplay: properly close/reopen AVAudioResampleContext on channel layout change
  avcodec: do not needlessly set packet size to 0 in avcodec_encode_audio2()
  avcodec: for audio encoding, reset output packet when it is not valid
  avcodec: refactor avcodec_encode_audio2() to merge common branches
  avcodec: remove fallbacks for AVCodec.encode() in avcodec_encode_audio2()

Conflicts:
	ffplay.c
	libavcodec/Makefile
	libavcodec/dvdata.c
	libavcodec/dvdata.h
	libavcodec/qdm2.c
	libavcodec/utils.c
	libavformat/flvenc.c
	libavformat/mov.c
	tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-08 22:02:59 +02:00
..
arm Merge remote-tracking branch 'qatar/master' 2012-05-07 22:51:34 +02:00
avr32
bfin
mips
ppc
sh4
tomi
x86
adler32.c
adler32.h
aes.c
aes.h
attributes.h
audio_fifo.c
audio_fifo.h
audioconvert.c
audioconvert.h
avassert.h
avstring.c
avstring.h
avutil.h Add yuva422p pix_fmt. 2012-05-08 08:39:37 +02:00
base64.c
base64.h
bprint.c
bprint.h
bswap.h
colorspace.h
common.h
cpu.c
cpu.h libavutil: Document the shortcommings of av_parse_cpu_flags() 2012-04-30 18:31:06 +02:00
crc_data.h
crc.c
crc.h
des.c
des.h
dict.c
dict.h
error.c
error.h
eval.c
eval.h
fifo.c
fifo.h
file.c
file.h
imgutils.c
imgutils.h
integer.c
integer.h
internal.h
intfloat_readwrite.c
intfloat_readwrite.h
intfloat.h
intmath.h
intreadwrite.h
inverse.c
lfg.c
lfg.h
libavutil.v
libm.h
lls.c
lls.h
log.c
log.h
lzo.c
lzo.h
Makefile Merge remote-tracking branch 'qatar/master' 2012-05-07 22:51:34 +02:00
mathematics.c
mathematics.h
md5.c
md5.h
mem.c
mem.h
opt.c lavu/opt: clarify error message in set_key_value_pair() 2012-04-30 23:04:46 +02:00
opt.h
parseutils.c
parseutils.h
pca.c
pca.h
pixdesc.c Add yuva422p pix_fmt. 2012-05-08 08:39:37 +02:00
pixdesc.h
pixfmt.h Add yuva422p pix_fmt. 2012-05-08 08:39:37 +02:00
random_seed.c
random_seed.h
rational.c
rational.h
rc4.c
rc4.h
samplefmt.c Merge remote-tracking branch 'qatar/master' 2012-05-08 22:02:59 +02:00
samplefmt.h Merge remote-tracking branch 'qatar/master' 2012-05-08 22:02:59 +02:00
sha.c
sha.h
softfloat.c
softfloat.h
timecode.c
timecode.h
timer.h
timestamp.h
tree.c
tree.h
utils.c
x86_cpu.h