FFmpeg/libavformat
Michael Niedermayer 1d186e9e12 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Revert "swscale: use 15-bit intermediates for 9/10-bit scaling."
  swscale: use 15-bit intermediates for 9/10-bit scaling.
  dct32: Add SSE2 ASM optimizations
  Correct chroma vector calculation for RealVideo 3.
  lavf: Add an option to discard corrupted frames
  mpegts: Mark wrongly-sized packets as corrupted
  mpegts: Move scan test to handle_packets
  mpegts: Mark corrupted packets
  mpegts: Reset continuity counter on seek
  mpegts: Fix for continuity counter
  mpegts: Silence "can't seek" warning on unseekable
  apichange: add an entry for AV_PKT_FLAG_CORRUPT
  avpacket: signal possibly corrupted packets
  mpeg4videodec: remove dead code that would have detected erroneous encoding
  aac: Remove some suspicious illegal memcpy()s from LTP.
  bink: Eliminate unnecessary shadow declaration.

Conflicts:
	doc/APIchanges
	libavcodec/version.h
	libavformat/avformat.h
	libavformat/options.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-02 22:12:18 +02:00
..
4xm.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
a64.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
aacdec.c Limit fsize before adding to pointer. 2011-07-31 19:40:08 +02:00
ac3dec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
adts.h
adtsenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
aea.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
aiff.h
aiffdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
aiffenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
allformats.c
amr.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
anm.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
apc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
ape.c Merge remote-tracking branch 'qatar/master' 2011-07-26 15:37:22 +02:00
apetag.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
apetag.h
applehttp.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
applehttpproto.c
asf.c
asf.h
asfcrypt.c Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
asfcrypt.h
asfdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
asfenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
assdec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
assenc.c
au.c au: reuse the result of the previous call to av_get_bits_per_sample() 2011-07-21 13:04:48 +02:00
audiointerleave.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
audiointerleave.h
avc.c
avc.h
avformat.h Merge remote-tracking branch 'qatar/master' 2011-08-02 22:12:18 +02:00
avi.c
avi.h
avidec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
avienc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
avio_internal.h
avio.c
avio.h Merge remote-tracking branch 'qatar/master' 2011-07-03 03:14:10 +02:00
aviobuf.c Merge remote-tracking branch 'qatar/master' 2011-07-16 19:43:35 +02:00
avisynth.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
avlanguage.c
avlanguage.h
avs.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
bethsoftvid.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
bfi.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
bink.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
c93.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
caf.c Cosmetics: Restore alphabetical order. 2011-08-01 00:58:49 +02:00
caf.h
cafdec.c Use little endian for caf codec tags. 2011-07-24 23:52:42 +02:00
cafenc.c Support muxing MP1, MP2 and MP3 in caf. 2011-08-01 00:58:49 +02:00
cavsvideodec.c
cdg.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
concat.c
crcenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
crypto.c crypto: Use av_freep instead of av_free 2011-06-09 02:43:55 +02:00
cutils.c
daud.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
dfa.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
diracdec.c
dnxhddec.c
dsicin.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
dtsdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
dv.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
dv.h
dvenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
dxa.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
eacdata.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
electronicarts.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
ffm.h
ffmdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
ffmenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
ffmeta.h
ffmetadec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
ffmetaenc.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
file.c
filmstripdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
filmstripenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
flacdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
flacenc_header.c
flacenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
flacenc.h
flic.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
flv.h Merge remote-tracking branch 'qatar/master' 2011-07-15 17:51:09 +02:00
flvdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
flvenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
framecrcenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
gif.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
gopher.c
gxf.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
gxf.h
gxfenc.c Merge remote-tracking branch 'qatar/master' 2011-07-18 16:43:46 +02:00
h261dec.c
h263dec.c
h264dec.c
http.c
http.h
httpauth.c
httpauth.h
id3v1.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
id3v1.h
id3v2.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
id3v2.h
idcin.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
idroqdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
idroqenc.c
iff.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
img2.c Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
ingenientdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
internal.h Merge commit 'b5849f77095439e994b11c25e6063d443b36c228' 2011-07-14 02:24:10 +02:00
ipmovie.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
isom.c Merge remote-tracking branch 'qatar/master' 2011-06-22 05:16:40 +02:00
isom.h
iss.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
iv8.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
ivfdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
ivfenc.c
jvdec.c
libavformat.v
libnut.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
librtmp.c Merge remote-tracking branch 'qatar/master' 2011-07-06 01:34:08 +02:00
lmlm4.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
lxfdec.c
m4vdec.c
Makefile Merge commit 'b5849f77095439e994b11c25e6063d443b36c228' 2011-07-14 02:24:10 +02:00
matroska.c
matroska.h
matroskadec.c Fix several security issues in matroskadec.c (MSVR-11-0080). 2011-07-28 14:59:54 +02:00
matroskaenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
md5enc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
md5proto.c
metadata.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
metadata.h Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
microdvddec.c
microdvdenc.c
mm.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mmf.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mms.c
mms.h
mmsh.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
mmst.c
mov.c Merge remote-tracking branch 'qatar/master' 2011-07-22 12:08:52 +02:00
movenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
movenc.h Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
movenchint.c Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
mp3dec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mp3enc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mpc8.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mpc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mpeg.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mpeg.h
mpegenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mpegts.c Merge remote-tracking branch 'qatar/master' 2011-08-02 22:12:18 +02:00
mpegts.h
mpegtsenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mpegvideodec.c
mpjpeg.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
msnwc_tcp.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mtv.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mvi.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mxf.c
mxf.h
mxfdec.c Merge remote-tracking branch 'qatar/master' 2011-07-30 06:46:08 +02:00
mxfenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mxg.c
ncdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
network.h
nsvdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
nullenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
nut.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
nut.h
nutdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
nutenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
nuv.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
oggdec.c Merge remote-tracking branch 'qatar/master' 2011-07-13 00:42:11 +02:00
oggdec.h Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
oggenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
oggparsecelt.c
oggparsedirac.c
oggparseflac.c
oggparseogm.c
oggparseskeleton.c
oggparsespeex.c
oggparsetheora.c
oggparsevorbis.c Remove all uses of now deprecated metadata functions. 2011-06-08 07:43:45 +02:00
oma.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
options.c Merge remote-tracking branch 'qatar/master' 2011-08-02 22:12:18 +02:00
os_support.c
os_support.h
pcm.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
pcm.h
pcmdec.c
pcmenc.c
pmpdec.c
psxstr.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
pva.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
qcp.c Merge remote-tracking branch 'qatar/master' 2011-07-15 17:51:09 +02:00
qtpalette.h
r3d.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
rawdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
rawdec.h
rawenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
rawenc.h
rawvideodec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
rdt.c Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
rdt.h Merge remote-tracking branch 'qatar/master' 2011-07-14 20:44:58 +02:00
riff.c Support FourCC DreX as MPEG4 ASP. 2011-08-01 01:23:39 +02:00
riff.h
rl2.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
rm.c
rm.h
rmdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
rmenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
rpl.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
rso.c
rso.h
rsodec.c
rsoenc.c
rtmp.h
rtmppkt.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
rtmppkt.h Merge remote-tracking branch 'qatar/master' 2011-07-03 03:14:10 +02:00
rtmpproto.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
rtp.c
rtp.h
rtpdec_amr.c
rtpdec_asf.c Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
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 Merge remote-tracking branch 'qatar/master' 2011-07-15 17:51:09 +02:00
rtpdec_vp8.c Merge remote-tracking branch 'qatar/master' 2011-07-15 17:51:09 +02:00
rtpdec_xiph.c
rtpdec.c Merge remote-tracking branch 'qatar/master' 2011-07-22 12:08:52 +02:00
rtpdec.h
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
rtpenc_chain.h
rtpenc_h263.c
rtpenc_h264.c Make buffer size check consistent and avoid a possible overflow. 2011-06-15 20:21:33 +02:00
rtpenc_latm.c Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200' 2011-06-17 05:49:58 +02:00
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
rtpenc.h Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
rtpproto.c rtp: disable udp fifos, the rtp code cannot work with the fifos in its current form as rtp bypasses the public API. 2011-07-25 16:37:12 +02:00
rtsp.c Merge remote-tracking branch 'qatar/master' 2011-07-19 18:46:04 +02:00
rtsp.h Merge remote-tracking branch 'qatar/master' 2011-07-19 18:46:04 +02:00
rtspcodes.h
rtspdec.c Merge remote-tracking branch 'qatar/master' 2011-07-19 18:46:04 +02:00
rtspenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
sapdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
sapenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
sauce.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
sauce.h
sdp.c Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
seek-test.c seektest: forgot adding a file (from commit 191c5f8ff3 during the last merge) 2011-07-14 17:55:15 +02:00
seek.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
seek.h
segafilm.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
sierravmd.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
siff.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
smacker.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
sol.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
sox.h
soxdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
soxenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
spdif.c
spdif.h
spdifdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
spdifenc.c Cosmetics: Fix indentation. 2011-08-01 00:58:49 +02:00
srtdec.c
swf.h
swfdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
swfenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
tcp.c
thp.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
tiertexseq.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
timefilter.c
timefilter.h
tmv.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
tta.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
tty.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
txd.c
udp.c udp: allow fifo size to be tuned seperately 2011-07-25 16:37:12 +02:00
url.h Merge remote-tracking branch 'qatar/master' 2011-07-14 20:44:58 +02:00
utils.c Merge remote-tracking branch 'qatar/master' 2011-08-02 22:12:18 +02:00
vc1test.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
vc1testenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
version.h Merge remote-tracking branch 'qatar/master' 2011-07-14 20:44:58 +02:00
voc.c
voc.h
vocdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
vocenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
vorbiscomment.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
vorbiscomment.h Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
vqf.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
wav.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
wc3movie.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
westwood.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
wtv.c doxygen: Fix parameter names to match the function prototypes. 2011-07-03 18:30:02 +02:00
wtv.h
wtvdec.c wtvdec: also support big-sectors when fat depth is zero 2011-07-15 16:57:35 +02:00
wv.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
xa.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
xwma.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
yop.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
yuv4mpeg.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00