Michael Niedermayer 976a8b2179 Merge remote-tracking branch 'qatar/master' ... * qatar/master: (40 commits) H.264: template left MB handling H.264: faster fill_decode_caches H.264: faster write_back_* H.264: faster fill_filter_caches H.264: make filter_mb_fast support the case of unavailable top mb Do not include log.h in avutil.h Do not include pixfmt.h in avutil.h Do not include rational.h in avutil.h Do not include mathematics.h in avutil.h Do not include intfloat_readwrite.h in avutil.h Remove return statements following infinite loops without break RTSP: Doxygen comment cleanup doxygen: Escape '\' in Doxygen documentation. md5: cosmetics md5: use AV_WL32 to write result md5: add fate test md5: include correct headers md5: fix test program doxygen: Drop array size declarations from Doxygen parameter names. doxygen: Fix parameter names to match the function prototypes. ... Conflicts: libavcodec/x86/dsputil_mmx.c libavformat/flvenc.c libavformat/oggenc.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-07-04 00:45:21 +02:00
..
4xm.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
a64.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
aacdec.c	Merge remote-tracking branch 'qatar/master'	2011-06-11 03:51:36 +02:00
ac3dec.c
adts.h
adtsenc.c
aea.c
aiff.h
aiffdec.c	replace remaining usage of deprecated av_metadata_set2() by av_dict_set()	2011-06-13 19:02:50 +02:00
aiffenc.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
allformats.c
amr.c
anm.c
apc.c
ape.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +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-04 00:45:21 +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-04 00:45:21 +02:00
asfenc.c	Merge remote-tracking branch 'qatar/master'	2011-06-09 04:47:19 +02:00
assdec.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
assenc.c
au.c
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-07-04 00:45:21 +02:00
avi.c
avi.h
avidec.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
avienc.c	Merge remote-tracking branch 'qatar/master'	2011-06-09 04:47:19 +02:00
avio_internal.h
avio.c	Simplify code and avoid compiler warning about incompatible types.	2011-06-01 20:29:27 +02:00
avio.h	Merge remote-tracking branch 'qatar/master'	2011-07-03 03:14:10 +02:00
aviobuf.c
avisynth.c
avlanguage.c
avlanguage.h
avs.c
bethsoftvid.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
bfi.c
bink.c	Fix bink audio playback outside of FFmpeg.	2011-06-20 23:28:55 +02:00
c93.c
caf.c
caf.h
cafdec.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
cafenc.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
cavsvideodec.c	Merge remote-tracking branch 'qatar/master'	2011-05-27 23:48:22 +02:00
cdg.c
concat.c
crcenc.c
crypto.c	crypto: Use av_freep instead of av_free	2011-06-09 02:43:55 +02:00
cutils.c
daud.c
dfa.c
diracdec.c	Merge remote-tracking branch 'qatar/master'	2011-05-27 23:48:22 +02:00
dnxhddec.c	Merge remote-tracking branch 'qatar/master'	2011-05-27 23:48:22 +02:00
dsicin.c
dtsdec.c
dv.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
dv.h
dvenc.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
dxa.c
eacdata.c
electronicarts.c
ffm.h
ffmdec.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
ffmenc.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +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
filmstripenc.c
flacdec.c
flacenc_header.c
flacenc.c	Merge remote-tracking branch 'qatar/master'	2011-06-09 04:47:19 +02:00
flacenc.h
flic.c
flv.h
flvdec.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
flvenc.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
framecrcenc.c
gif.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
gopher.c
gxf.c	Merge remote-tracking branch 'qatar/master'	2011-06-24 03:07:04 +02:00
gxf.h
gxfenc.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
h261dec.c	Merge remote-tracking branch 'qatar/master'	2011-05-27 23:48:22 +02:00
h263dec.c	Merge remote-tracking branch 'qatar/master'	2011-05-27 23:48:22 +02:00
h264dec.c	Merge remote-tracking branch 'qatar/master'	2011-05-27 23:48:22 +02:00
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
idroqdec.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
idroqenc.c
iff.c	Merge remote-tracking branch 'qatar/master'	2011-06-09 04:47:19 +02:00
img2.c	riff/img2: Add JPEG 2000 codec IDs.	2011-06-21 21:38:59 +02:00
ingenientdec.c	Merge remote-tracking branch 'qatar/master'	2011-06-05 03:00:31 +02:00
internal.h	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
ipmovie.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
isom.c	Merge remote-tracking branch 'qatar/master'	2011-06-22 05:16:40 +02:00
isom.h
iss.c
iv8.c
ivfdec.c
ivfenc.c
jvdec.c
libavformat.v
libnut.c
librtmp.c
lmlm4.c
lxfdec.c
m4vdec.c	Merge remote-tracking branch 'qatar/master'	2011-05-27 23:48:22 +02:00
Makefile	Merge remote-tracking branch 'qatar/master'	2011-07-03 03:14:10 +02:00
matroska.c
matroska.h	Merge remote-tracking branch 'qatar/master' into master	2011-05-29 03:34:35 +02:00
matroskadec.c	Merge remote-tracking branch 'qatar/master'	2011-07-02 03:24:32 +02:00
matroskaenc.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
md5enc.c
md5proto.c
metadata-example.c	libavformat: Add an example how to use the metadata API	2011-07-02 13:52:29 +02:00
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-04 00:45:21 +02:00
mmf.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +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-04 00:45:21 +02:00
movenc.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
movenc.h	Merge remote-tracking branch 'qatar/master'	2011-06-11 03:51:36 +02:00
movenchint.c
mp3dec.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
mp3enc.c	Merge remote-tracking branch 'qatar/master'	2011-06-09 04:47:19 +02:00
mpc8.c
mpc.c	Merge remote-tracking branch 'qatar/master'	2011-06-09 04:47:19 +02:00
mpeg.c	Merge remote-tracking branch 'qatar/master'	2011-06-11 03:51:36 +02:00
mpeg.h
mpegenc.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
mpegts.c	Merge remote-tracking branch 'qatar/master'	2011-06-24 03:07:04 +02:00
mpegts.h
mpegtsenc.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
mpegvideodec.c	Merge remote-tracking branch 'qatar/master'	2011-05-27 23:48:22 +02:00
mpjpeg.c
msnwc_tcp.c
mtv.c
mvi.c
mxf.c
mxf.h
mxfdec.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
mxfenc.c
mxg.c
ncdec.c
network.h	Merge remote-tracking branch 'qatar/master'	2011-06-05 03:00:31 +02:00
nsvdec.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
nullenc.c
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-04 00:45:21 +02:00
nutenc.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
nuv.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
oggdec.c	Merge remote-tracking branch 'qatar/master'	2011-06-30 04:32:24 +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-04 00:45:21 +02:00
oggparsecelt.c	Fix various unused variable warnings	2011-05-30 00:24:01 +02:00
oggparsedirac.c
oggparseflac.c
oggparseogm.c	Remove unused variables	2011-06-02 20:06:00 +01:00
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-04 00:45:21 +02:00
options.c	Merge remote-tracking branch 'qatar/master'	2011-06-18 05:10:38 +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-04 00:45:21 +02:00
pva.c
qcp.c
qtpalette.h
r3d.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
rawdec.c	Merge remote-tracking branch 'qatar/master'	2011-06-06 03:33:58 +02:00
rawdec.h	Merge remote-tracking branch 'qatar/master'	2011-06-05 03:00:31 +02:00
rawenc.c
rawenc.h
rawvideodec.c	Merge remote-tracking branch 'qatar/master'	2011-05-27 23:48:22 +02:00
rdt.c	Merge remote-tracking branch 'qatar/master'	2011-06-18 05:10:38 +02:00
rdt.h
riff.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
riff.h
rl2.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
rm.c
rm.h
rmdec.c	Merge remote-tracking branch 'qatar/master'	2011-06-09 04:47:19 +02:00
rmenc.c	Merge remote-tracking branch 'qatar/master'	2011-06-09 04:47:19 +02:00
rpl.c	Merge remote-tracking branch 'qatar/master'	2011-06-09 04:47:19 +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	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
rtpdec_mpeg4.c
rtpdec_qcelp.c
rtpdec_qdm2.c
rtpdec_qt.c
rtpdec_svq3.c
rtpdec_vp8.c
rtpdec_xiph.c
rtpdec.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +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-04 00:45:21 +02:00
rtpenc.h	Merge remote-tracking branch 'qatar/master'	2011-06-11 03:51:36 +02:00
rtpproto.c	Merge remote-tracking branch 'qatar/master'	2011-06-24 03:07:04 +02:00
rtsp.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
rtsp.h	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
rtspcodes.h
rtspdec.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
rtspenc.c	Merge remote-tracking branch 'qatar/master'	2011-06-11 03:51:36 +02:00
sapdec.c	Merge remote-tracking branch 'qatar/master'	2011-06-18 05:10:38 +02:00
sapenc.c
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.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
seek.h
segafilm.c
sierravmd.c
siff.c
smacker.c	Remove unused variables	2011-06-02 20:06:00 +01:00
sol.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
sox.h
soxdec.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
soxenc.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
spdif.c
spdif.h
spdifdec.c
spdifenc.c
srtdec.c
swf.h
swfdec.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
swfenc.c
tcp.c	TCP: change default timeout to 5sec	2011-05-30 02:39:26 +02:00
thp.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
tiertexseq.c
timefilter.c
timefilter.h
tmv.c
tta.c	Merge remote-tracking branch 'qatar/master'	2011-06-09 04:47:19 +02:00
tty.c	Merge remote-tracking branch 'qatar/master'	2011-06-09 04:47:19 +02:00
txd.c
udp.c	Merge remote-tracking branch 'qatar/master'	2011-07-01 05:35:26 +02:00
url.h
utils.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
vc1test.c
vc1testenc.c
version.h	lavf: bump minor and add APIchanges entry for av_get_output_timestamp	2011-07-01 11:11:48 +02:00
voc.c
voc.h
vocdec.c
vocenc.c
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-04 00:45:21 +02:00
wav.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
wc3movie.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
westwood.c
wtv.c	doxygen: Fix parameter names to match the function prototypes.	2011-07-03 18:30:02 +02:00
wtv.h
wtvdec.c	Merge remote-tracking branch 'qatar/master'	2011-07-04 00:45:21 +02:00
wv.c	Merge remote-tracking branch 'qatar/master'	2011-06-29 05:23:12 +02:00
xa.c
xwma.c
yop.c
yuv4mpeg.c	Remove unused variables	2011-06-02 20:06:00 +01:00