Michael Niedermayer 523c8e0503 Merge commit '50c449ac24fbb4c03c15d2e2026cef2204b80385' ... * commit '50c449ac24fbb4c03c15d2e2026cef2204b80385': iff: validate CMAP palette size asfenc: return error on negative timestamp Conflicts: libavformat/iff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-03-18 17:30:53 +01:00
..
4xm.c
a64.c	lavc: remove unecessary a64enc include.	2013-03-17 04:38:28 +01:00
aacdec.c
ac3dec.c
act.c
adtsenc.c
adxdec.c
aea.c
afc.c
aiff.h
aiffdec.c
aiffenc.c
allformats.c	Add raw VC-1 muxer to match demuxer.	2013-03-16 13:42:53 +01:00
amr.c
anm.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
apc.c
ape.c	Merge remote-tracking branch 'qatar/master'	2013-03-15 13:43:01 +01:00
apetag.c
apetag.h
apetagenc.c
aqtitledec.c
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c
asfenc.c	Merge commit '50c449ac24fbb4c03c15d2e2026cef2204b80385'	2013-03-18 17:30:53 +01:00
assdec.c
assenc.c
ast.c
ast.h
astdec.c	lavc & lavf: replace deprecated av_log* functions	2013-03-15 18:10:28 +00:00
astenc.c
au.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
audiointerleave.c
audiointerleave.h
avc.c
avc.h
avformat.h
avi.h
avidec.c
avienc.c
avio_internal.h
avio.c
avio.h	lavf/avio: fix two extreemly unreasonble typos.	2013-03-14 23:36:30 +01:00
aviobuf.c
avisynth.c
avlanguage.c
avlanguage.h
avr.c	lavc & lavf: replace deprecated av_log* functions	2013-03-15 18:10:28 +00:00
avs.c
bethsoftvid.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
bfi.c
bink.c
bintext.c
bit.c
bluray.c
bmv.c
brstm.c	lavc & lavf: replace deprecated av_log* functions	2013-03-15 18:10:28 +00:00
c93.c
cache.c
caf.c
caf.h
cafdec.c
cafenc.c
cavsvideodec.c
cdg.c
cdxl.c
concat.c
concatdec.c
crcenc.c
crypto.c
cutils.c
data_uri.c
daud.c
dfa.c
diracdec.c
dnxhddec.c
dsicin.c
dtsdec.c
dtshddec.c
dv.c
dv.h
dvenc.c
dxa.c
eacdata.c
electronicarts.c	lavc & lavf: replace deprecated av_log* functions	2013-03-15 18:10:28 +00:00
epafdec.c	lavc & lavf: replace deprecated av_log* functions	2013-03-15 18:10:28 +00:00
ffm.h
ffmdec.c
ffmenc.c
ffmeta.h
ffmetadec.c
ffmetaenc.c
file.c
filmstripdec.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
filmstripenc.c
flacdec.c	Merge commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6'	2013-03-16 14:10:09 +01:00
flacenc_header.c
flacenc.c
flacenc.h
flic.c
flv.h
flvdec.c
flvenc.c
framecrcenc.c
framehash.c
frmdec.c
g722.c
g723_1.c
g729dec.c
gif.c
gifdec.c
gopher.c
gsmdec.c
gxf.c
gxf.h
gxfenc.c
h261dec.c
h263dec.c
h264dec.c
hls.c
hlsenc.c
hlsproto.c
http.c
http.h
httpauth.c
httpauth.h
icodec.c	lavc & lavf: replace deprecated av_log* functions	2013-03-15 18:10:28 +00:00
icoenc.c
id3v1.c
id3v1.h
id3v2.c
id3v2.h
id3v2enc.c
idcin.c
idroqdec.c
idroqenc.c
iff.c	Merge commit '50c449ac24fbb4c03c15d2e2026cef2204b80385'	2013-03-18 17:30:53 +01:00
ilbc.c
img2.c
img2dec.c
img2enc.c
ingenientdec.c
internal.h
ipmovie.c
ircam.c
ircam.h
ircamdec.c
ircamenc.c
isom.c
isom.h
iss.c
iv8.c
ivfdec.c
ivfenc.c
jacosubdec.c
jacosubenc.c
jvdec.c
latmenc.c
libavformat.v
libmodplug.c
libnut.c
librtmp.c
lmlm4.c
loasdec.c
log2_tab.c
lvfdec.c	lavc & lavf: replace deprecated av_log* functions	2013-03-15 18:10:28 +00:00
lxfdec.c	lavc & lavf: replace deprecated av_log* functions	2013-03-15 18:10:28 +00:00
m4vdec.c
Makefile
matroska.c
matroska.h
matroskadec.c	matroskadec: avoid integer overflow	2013-03-15 13:48:04 +01:00
matroskaenc.c
md5enc.c
md5proto.c
metadata.c
metadata.h
mgsts.c
microdvddec.c
microdvdenc.c
mkvtimestamp_v2.c
mm.c
mmf.c
mms.c
mms.h
mmsh.c
mmst.c
mov_chan.c
mov_chan.h
mov.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
movenc.c
movenc.h
movenchint.c
mp3dec.c
mp3enc.c
mpc8.c
mpc.c
mpeg.c	mpeg: Add passing DVD navigation packets (startcode 0x1bf) to caller to allow better playback handling of DVDs.	2013-03-17 16:24:34 +01:00
mpeg.h	Merge commit 'b164d66e35d349de414e2f0d7365a147aba8a620'	2013-03-15 13:28:38 +01:00
mpegenc.c
mpegts.c	Merge commit 'b164d66e35d349de414e2f0d7365a147aba8a620'	2013-03-15 13:28:38 +01:00
mpegts.h	Merge commit 'b164d66e35d349de414e2f0d7365a147aba8a620'	2013-03-15 13:28:38 +01:00
mpegtsenc.c	Merge commit 'b164d66e35d349de414e2f0d7365a147aba8a620'	2013-03-15 13:28:38 +01:00
mpegvideodec.c
mpjpeg.c
mpl2dec.c
mpsubdec.c
msnwc_tcp.c
mtv.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
mux.c
mvdec.c	lavc & lavf: replace deprecated av_log* functions	2013-03-15 18:10:28 +00:00
mvi.c
mxf.c
mxf.h
mxfdec.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
mxfenc.c
mxg.c
ncdec.c
network.c
network.h
nistspheredec.c	lavc & lavf: replace deprecated av_log* functions	2013-03-15 18:10:28 +00:00
noproxy-test.c
nsvdec.c
nullenc.c
nut.c
nut.h
nutdec.c
nutenc.c
nuv.c
oggdec.c	lavc & lavf: replace deprecated av_log* functions	2013-03-15 18:10:28 +00:00
oggdec.h
oggenc.c
oggparsecelt.c
oggparsedirac.c
oggparseflac.c
oggparseogm.c
oggparseopus.c
oggparseskeleton.c
oggparsespeex.c
oggparsetheora.c
oggparsevorbis.c
oma.c
oma.h
omadec.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
omaenc.c
options_table.h
options.c
os_support.c	Make ff_win32_open more robust.	2013-03-16 13:40:36 +01:00
os_support.h
paf.c
pcm.c
pcm.h
pcmdec.c
pcmenc.c
pjsdec.c
pmpdec.c	lavc & lavf: replace deprecated av_log* functions	2013-03-15 18:10:28 +00:00
psxstr.c
pva.c
pvfdec.c
qcp.c
qtpalette.h
r3d.c
rawdec.c
rawdec.h
rawenc.c	Add raw VC-1 muxer to match demuxer.	2013-03-16 13:42:53 +01:00
rawenc.h
rawvideodec.c
rdt.c
rdt.h
realtextdec.c
riff.c
riff.h
rl2.c
rm.c
rm.h
rmdec.c	rmdec: flush audio packet on seeking	2013-03-18 00:08:59 +01:00
rmenc.c
rmsipr.c
rmsipr.h
rpl.c
rso.c
rso.h
rsodec.c	Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605'	2013-03-14 12:52:12 +01:00
rsoenc.c
rtmp.h
rtmpcrypt.c
rtmpcrypt.h
rtmpdh.c
rtmpdh.h
rtmphttp.c
rtmppkt.c
rtmppkt.h
rtmpproto.c
rtp.c
rtp.h
rtpdec_amr.c
rtpdec_asf.c
rtpdec_formats.h
rtpdec_g726.c
rtpdec_h263_rfc2190.c
rtpdec_h263.c
rtpdec_h264.c
rtpdec_ilbc.c
rtpdec_jpeg.c
rtpdec_latm.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
rtpdec_mpeg4.c
rtpdec_mpeg12.c
rtpdec_mpegts.c
rtpdec_qcelp.c
rtpdec_qdm2.c
rtpdec_qt.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
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_rfc2190.c
rtpenc_h263.c
rtpenc_h264.c
rtpenc_jpeg.c
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c
rtpenc.h
rtpproto.c
rtsp.c
rtsp.h
rtspcodes.h
rtspdec.c
rtspenc.c
samidec.c
sapdec.c
sapenc.c
sauce.c
sauce.h
sbgdec.c
sctp.c
sdp.c
seek-test.c
seek.c
seek.h
segafilm.c
segment.c
sierravmd.c
siff.c
smacker.c
smjpeg.c
smjpeg.h
smjpegdec.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
smjpegenc.c
smoothstreamingenc.c
smush.c
sol.c
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
spdifenc.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
srtdec.c
srtenc.c
srtp.c
srtp.h
srtpproto.c
subtitles.c
subtitles.h
subviewer1dec.c
subviewerdec.c
swf.c
swf.h
swfdec.c
swfenc.c
takdec.c
tcp.c
tedcaptionsdec.c
tee.c
thp.c
tiertexseq.c
tls.c
tmv.c
tta.c
tty.c
txd.c
udp.c
url-test.c
url.h
urldecode.c
urldecode.h
utils.c	append_packet_chunked: Remove unused initialization.	2013-03-16 17:03:41 +01:00
vc1test.c
vc1testenc.c	vc1testenc: give muxer same name as demuxer	2013-03-16 13:42:16 +01:00
version.h
vivo.c
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c
vorbiscomment.h
vplayerdec.c
vqf.c
w64.c
w64.h
wavdec.c
wavenc.c
wc3movie.c
webvttdec.c
westwood_aud.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
westwood_vqa.c
wtv.c
wtv.h
wtvdec.c
wtvenc.c
wv.c
wvenc.c	lavc & lavf: replace deprecated av_log* functions	2013-03-15 18:10:28 +00:00
xa.c
xmv.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
xwma.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
yop.c
yuv4mpeg.c