Michael Niedermayer b81f8880e0 Merge remote-tracking branch 'qatar/master' ... * qatar/master: (23 commits) fix AC3ENC_OPT_MODE_ON/OFF h264: fix HRD parameters parsing prores: implement multithreading. prores: idct sse2/sse4 optimizations. swscale: use aligned move for storage into temporary buffer. prores: extract idct into its own dspcontext and merge with put_pixels. h264: fix invalid shifts in init_cavlc_level_tab() intfloat_readwrite: fix signed addition overflows mov: do not misreport empty stts mov: cosmetics, fix for and if spacing id3v2: fix NULL pointer dereference mov: read album_artist atom mov: fix disc/track numbers and totals doc: fix references to obsolete presets directories for avconv/ffmpeg flashsv: return more meaningful error value flashsv: fix typo in av_log() message smacker: validate channels and sample format. smacker: check buffer size before reading output size smacker: validate number of channels smacker: Separate audio flags from sample rates in smacker demuxer. ... Conflicts: cmdutils.h doc/ffmpeg.texi libavcodec/Makefile libavcodec/motion_est_template.c libavformat/id3v2.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-10-12 05:40:57 +02:00
..
4xm.c	Merge remote-tracking branch 'qatar/master'	2011-10-11 03:42:43 +02:00
a64.c
aacdec.c
ac3dec.c
act.c	act: correct file description comment	2011-09-26 00:24:01 +02:00
adts.h
adtsenc.c
aea.c
aiff.h
aiffdec.c
aiffenc.c
allformats.c	g723.1 muxer	2011-10-10 02:58:18 +02:00
amr.c
anm.c	Fix double free on error in Deluxe Paint Animation demuxer.	2011-10-01 02:41:39 +02:00
apc.c
ape.c
apetag.c
apetag.h
applehttp.c
applehttpproto.c
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c
asfenc.c	Use WMAv2 as default audio codec for asf.	2011-10-05 23:44:14 +02:00
assdec.c
assenc.c
au.c
audiointerleave.c
audiointerleave.h
avc.c
avc.h
avformat.h	lavf/utils: document AVIndexEntry.timestamp	2011-10-06 20:21:40 +02:00
avi.c
avi.h
avidec.c	Merge remote-tracking branch 'qatar/master'	2011-10-11 03:42:43 +02:00
avienc.c	avienc: Add a limit on the number of skiped frames muxed in a row.	2011-10-01 03:48:33 +02:00
avio_internal.h
avio.c
avio.h
aviobuf.c	aviobuf: Replace av_realloc by av_realloc_f when relevant.	2011-09-28 18:13:52 +02:00
avisynth.c
avlanguage.c
avlanguage.h
avs.c	avsdemux: check for out of bound writes	2011-10-10 21:36:12 +02:00
bethsoftvid.c
bfi.c
bink.c	[bink] Check return value of avio_seek and avoid modifying state if it fails	2011-09-14 19:51:07 +02:00
bintext.c	bintext: remove unused variable.	2011-09-28 16:11:01 +02:00
bit.c	bit: remove more unused variables	2011-09-25 12:29:20 +02:00
c93.c
caf.c
caf.h
cafdec.c	[cafdec] Check return value of avio_seek and avoid modifying state if it fails	2011-09-14 19:51:07 +02:00
cafenc.c
cavsvideodec.c
cdg.c	cdg: enable seeking	2011-10-12 04:15:40 +02:00
concat.c
crcenc.c
crypto.c
cutils.c
daud.c	Merge remote-tracking branch 'qatar/master'	2011-09-24 22:39:52 +02:00
dfa.c
diracdec.c
dnxhddec.c
dsicin.c
dtsdec.c
dv.c	[dv] Check return value of avio_seek and avoid modifying state if it fails	2011-09-14 19:51:07 +02:00
dv.h
dvenc.c
dxa.c
eacdata.c
electronicarts.c
ffm.h
ffmdec.c	[ffmdec] Check return value of avio_seek and avoid modifying state if it fails	2011-09-14 19:51:07 +02:00
ffmenc.c
ffmeta.h
ffmetadec.c
ffmetaenc.c
file.c	return error code if error happens	2011-10-07 22:28:07 +02:00
filmstripdec.c	[filmstrip] Check return value of avio_seek and avoid modifying state if it fails	2011-09-14 19:51:07 +02:00
filmstripenc.c
flacdec.c
flacenc_header.c
flacenc.c
flacenc.h
flic.c
flv.h
flvdec.c	flvdec: Check for overflow before allocating arrays	2011-09-25 12:55:21 +03:00
flvenc.c	flvenc: Ignore metadata that has special values and is stored already based on	2011-10-06 03:20:57 +02:00
framecrcenc.c
g723_1.c	g723.1 muxer	2011-10-10 02:58:18 +02:00
gif.c
gopher.c
gxf.c
gxf.h
gxfenc.c	gxfenc: Replace av_realloc by av_realloc_f when relevant.	2011-09-28 18:13:52 +02:00
h261dec.c
h263dec.c
h264dec.c
http.c
http.h
httpauth.c
httpauth.h
id3v1.c
id3v1.h
id3v2.c	Merge remote-tracking branch 'qatar/master'	2011-10-12 05:40:57 +02:00
id3v2.h	id3v2: Fix some (function) pointer types.	2011-09-25 23:01:43 +02:00
idcin.c
idroqdec.c
idroqenc.c	Merge remote-tracking branch 'qatar/master'	2011-09-24 22:39:52 +02:00
iff.c	Merge remote-tracking branch 'qatar/master'	2011-09-23 00:35:31 +02:00
img2.c	Merge remote-tracking branch 'qatar/master'	2011-10-06 03:42:14 +02:00
ingenientdec.c	Merge remote-tracking branch 'qatar/master'	2011-09-17 22:36:43 +02:00
internal.h
ipmovie.c
isom.c	Do not auto-detect Sorenson Spark in f4v.	2011-10-09 22:58:31 +02:00
isom.h
iss.c
iv8.c
ivfdec.c
ivfenc.c
jvdec.c	[jvd] Check return value of avio_seek and avoid modifying state if it fails	2011-09-14 19:53:39 +02:00
latmenc.c	Merge remote-tracking branch 'qatar/master'	2011-10-01 02:54:46 +02:00
libavformat.v
libmodplug.c	libmodplug: do not call av_expr_parse() in case of no expr specified.	2011-10-10 21:15:26 +02:00
libnut.c
librtmp.c
lmlm4.c
loasdec.c
lxfdec.c
m4vdec.c
Makefile	g723.1 muxer	2011-10-10 02:58:18 +02:00
matroska.c
matroska.h
matroskadec.c	Merge remote-tracking branch 'qatar/master'	2011-09-29 01:11:01 +02:00
matroskaenc.c	Merge remote-tracking branch 'qatar/master'	2011-09-28 02:07:44 +02:00
md5enc.c
md5proto.c
metadata.c
metadata.h
microdvddec.c
microdvdenc.c
mm.c
mmf.c
mms.c
mms.h
mmsh.c
mmst.c
mov.c	Merge remote-tracking branch 'qatar/master'	2011-10-12 05:40:57 +02:00
movenc.c	Merge remote-tracking branch 'qatar/master'	2011-10-06 03:42:14 +02:00
movenc.h
movenchint.c
mp3dec.c	mp3demux: pass on error code on packet read.	2011-09-21 00:51:53 +02:00
mp3enc.c
mpc8.c	mpc8: Fix return value on EOF	2011-10-07 16:25:30 +02:00
mpc.c
mpeg.c	Merge remote-tracking branch 'qatar/master'	2011-10-08 03:39:01 +02:00
mpeg.h
mpegenc.c
mpegts.c	mpegts: reduce av_log level for seek back to begin on unseekable protocols to info level.	2011-10-10 15:40:08 +02:00
mpegts.h
mpegtsenc.c	mpegtsenc: Lift limit on PMT PID	2011-10-03 16:03:29 +02:00
mpegvideodec.c
mpjpeg.c
msnwc_tcp.c
mtv.c
mvi.c
mxf.c	mxf: Add PictureEssenceCoding UL for V210	2011-09-27 22:27:52 +02:00
mxf.h
mxfdec.c	Merge remote-tracking branch 'qatar/master'	2011-10-11 03:42:43 +02:00
mxfenc.c	mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container	2011-09-16 18:16:30 +02:00
mxg.c
ncdec.c
network.h
nsvdec.c	[nsv] Check return value of avio_seek and avoid modifying state if it fails	2011-09-14 19:53:45 +02:00
nullenc.c
nut.c
nut.h
nutdec.c
nutenc.c
nuv.c	Set AV_PKT_FLAG_KEY based on nupplevideo header	2011-09-18 18:25:44 +02:00
oggdec.c	oggdec: add support for Xiph's CELT codec	2011-09-26 13:51:29 +02:00
oggdec.h	oggdec: add support for Xiph's CELT codec	2011-09-26 13:51:29 +02:00
oggenc.c	oggenc: favor av_freep()	2011-10-01 01:26:55 +02:00
oggparsecelt.c	Merge remote-tracking branch 'qatar/master'	2011-10-05 04:07:59 +02:00
oggparsedirac.c
oggparseflac.c
oggparseogm.c
oggparseskeleton.c
oggparsespeex.c
oggparsetheora.c
oggparsevorbis.c
oma.c	Merge remote-tracking branch 'qatar/master'	2011-09-21 21:25:43 +02:00
options.c
os_support.c
os_support.h
pcm.c
pcm.h
pcmdec.c	Merge remote-tracking branch 'qatar/master'	2011-09-24 22:39:52 +02:00
pcmenc.c	Merge remote-tracking branch 'qatar/master'	2011-09-24 22:39:52 +02:00
pmpdec.c
psxstr.c	psxstr: improve probe to not misdetect so much.	2011-09-23 19:10:55 +02:00
pva.c
qcp.c
qtpalette.h
r3d.c	[r3d] Check return value of avio_seek and avoid modifying state if it fails	2011-09-14 19:53:45 +02:00
rawdec.c	Merge remote-tracking branch 'qatar/master'	2011-09-23 00:35:31 +02:00
rawdec.h	Merge remote-tracking branch 'qatar/master'	2011-09-17 22:36:43 +02:00
rawenc.c
rawenc.h
rawvideodec.c	Merge remote-tracking branch 'qatar/master'	2011-09-17 22:36:43 +02:00
rdt.c
rdt.h
riff.c	Merge remote-tracking branch 'qatar/master'	2011-10-05 04:07:59 +02:00
riff.h
rl2.c
rm.c
rm.h
rmdec.c	Merge remote-tracking branch 'qatar/master'	2011-09-19 22:45:34 +02:00
rmenc.c
rpl.c
rso.c
rso.h
rsodec.c
rsoenc.c
rtmp.h
rtmppkt.c
rtmppkt.h
rtmpproto.c	Merge remote-tracking branch 'qatar/master'	2011-09-23 00:35:31 +02:00
rtp.c	Add the G723.1 demuxer and decoder	2011-09-29 21:44:03 +02:00
rtp.h	Merge remote-tracking branch 'qatar/master'	2011-09-27 02:14:37 +02:00
rtpdec_amr.c
rtpdec_asf.c
rtpdec_formats.h
rtpdec_h263.c
rtpdec_h264.c
rtpdec_latm.c
rtpdec_mpeg4.c
rtpdec_qcelp.c
rtpdec_qdm2.c
rtpdec_qt.c
rtpdec_svq3.c
rtpdec_vp8.c
rtpdec_xiph.c
rtpdec.c
rtpdec.h
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c
rtpenc_chain.h
rtpenc_h263.c
rtpenc_h264.c
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c	Merge remote-tracking branch 'qatar/master'	2011-09-27 02:14:37 +02:00
rtpenc.h
rtpproto.c
rtsp.c
rtsp.h
rtspcodes.h
rtspdec.c	rtspdec: Require TCP-interleaved RTP packets to be at least 11 bytes, instead of 12.	2011-09-20 21:58:15 +02:00
rtspenc.c
sapdec.c
sapenc.c
sauce.c
sauce.h
sdp.c	Merge remote-tracking branch 'qatar/master'	2011-09-27 02:14:37 +02:00
seek-test.c
seek.c
seek.h
segafilm.c	segafilm: Check for memory allocation failures in segafilm demuxer.	2011-10-06 23:19:45 +02:00
sierravmd.c
siff.c
smacker.c	Merge remote-tracking branch 'qatar/master'	2011-10-12 05:40:57 +02:00
sol.c	Merge remote-tracking branch 'qatar/master'	2011-09-27 02:14:37 +02:00
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c
spdifenc.c
srtdec.c
swf.h
swfdec.c	swfdec: return correct error code at EOF	2011-09-27 14:52:46 +02:00
swfenc.c
tcp.c
thp.c
tiertexseq.c
timefilter.c
timefilter.h
tmv.c	[tmv] Check return value of avio_seek and avoid modifying state if it fails	2011-09-14 19:53:45 +02:00
tta.c	[tta] Check return value of avio_seek and avoid modifying state if it fails	2011-09-14 19:53:45 +02:00
tty.c
txd.c	Merge remote-tracking branch 'qatar/master'	2011-09-24 22:39:52 +02:00
udp.c
url.h
utils.c	lavf: check stream_index from read_packet() for validity.	2011-10-12 01:04:12 +02:00
vc1test.c
vc1testenc.c
version.h	Bump minor for G.723.1 encoder and muxer.	2011-10-10 10:25:07 +02:00
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c
vorbiscomment.h
vqf.c
wav.c	Support playing SMV files.	2011-10-10 17:38:51 +02:00
wc3movie.c
westwood.c	vqa: fix double free on corrupted streams	2011-10-09 03:08:03 +02:00
wtv.c
wtv.h
wtvdec.c	[wtv] Check return value of avio_seek and avoid modifying state if it fails	2011-09-14 19:53:45 +02:00
wtvenc.c	act, bintext, wtvenc: use named struct initializers	2011-09-26 00:22:41 +02:00
wv.c
xa.c
xmv.c
xwma.c
yop.c	[yop] Check return value of avio_seek and avoid modifying state if it fails	2011-09-14 19:53:45 +02:00
yuv4mpeg.c