Michael Niedermayer 99eb31e263 Merge remote-tracking branch 'qatar/master' ... * qatar/master: (25 commits) Replace custom DEBUG preprocessor trickery by the standard one. vorbis: Remove non-compiling debug statement. vorbis: Remove pointless DEBUG #ifdef around debug output macros. cook: Remove non-compiling debug output. Remove pointless #ifdefs around function declarations in a header. Replace #ifdef + av_log() combinations by av_dlog(). Replace custom debug output functions by av_dlog(). cook: Remove unused debug functions. Remove stray extra arguments from av_dlog() invocations. targa: fix big-endian build v4l2: remove one forgotten use of AVFormatParameters.pix_fmt. vfwcap: add a framerate private option. v4l2: add a framerate private option. libdc1394: add a framerate private option. fbdev: add a framerate private option. bktr: add a framerate private option. oma: check avio_read() return value nutdec: remove unused variable Remove unused variables swscale: allocate larger buffer to handle altivec overreads. ... Conflicts: ffmpeg.c libavcodec/dca.c libavcodec/dirac.c libavcodec/error_resilience.c libavcodec/h264.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pthread.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/shorten.c libavcodec/truemotion2.c libavcodec/utils.c libavdevice/dv1394.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/4xm.c libavformat/apetag.c libavformat/asfdec.c libavformat/avidec.c libavformat/mmf.c libavformat/mpeg.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/oggdec.c libavformat/oggparseogm.c libavformat/rl2.c libavformat/rmdec.c libavformat/rpl.c libavformat/rtpdec_latm.c libavformat/sauce.c libavformat/sol.c libswscale/utils.c tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-06-03 05:19:30 +02:00
..
4xm.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
a64.c
aacdec.c
ac3dec.c
adts.h
adtsenc.c
aea.c
aiff.h
aiffdec.c	aiffdec:Rewrite get_meta()	2011-05-06 17:39:31 +02:00
aiffenc.c	Write channel_layout for multichannel aif files.	2011-05-17 01:56:01 +02:00
allformats.c	Initial caf muxer.	2011-05-15 03:25:57 +02:00
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-03 05:19:30 +02:00
apetag.h
applehttp.c	Merge remote branch 'qatar/master'	2011-05-13 04:40:40 +02:00
applehttpproto.c	Merge remote branch 'qatar/master'	2011-05-13 04:40:40 +02:00
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
asfenc.c
assdec.c
assenc.c
au.c
audiointerleave.c
audiointerleave.h
avc.c
avc.h
avformat.h	lavf: tag dump_format() as @deprecated	2011-06-01 13:07:57 +02:00
avi.c
avi.h
avidec.c	Remove unused variables	2011-06-02 20:06:00 +01:00
avienc.c	avienc: Update 2 debug statements to match the current code.	2011-05-09 17:49:25 +02:00
avio_internal.h	Merge remote-tracking branch 'qatar/master'	2011-05-22 04:53:19 +02:00
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-05-22 04:53:19 +02:00
aviobuf.c	Merge remote-tracking branch 'qatar/master'	2011-05-22 04:53:19 +02:00
avisynth.c
avlanguage.c
avlanguage.h
avs.c
bethsoftvid.c
bfi.c
bink.c
c93.c
caf.c	Support decoding of amr_nb and gsm in caf.	2011-05-15 03:25:57 +02:00
caf.h	Move channel chunk reading function to isom.c.	2011-04-28 10:45:32 +02:00
cafdec.c	Move channel chunk reading function to isom.c.	2011-04-28 10:45:32 +02:00
cafenc.c	Fix ff_mov_write_chan() so it can be used by other muxers.	2011-05-17 01:47:12 +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	lavf: use designated initializers for AVClasses.	2011-05-17 23:01:42 +02:00
cutils.c	Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45'	2011-05-01 00:26:05 +02:00
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	Make DV (sub) demuxer set proper pkt->pos values.	2011-05-02 18:38:01 +02:00
dv.h	Make DV (sub) demuxer set proper pkt->pos values.	2011-05-02 18:38:01 +02:00
dvenc.c
dxa.c
eacdata.c	Set channel layout for 4 and 5.1 channel cdata audio files	2011-04-25 12:13:51 +10:00
electronicarts.c
ffm.h
ffmdec.c	Merge remote branch 'qatar/master'	2011-04-30 01:58:26 +02:00
ffmenc.c
ffmeta.h	Merge remote-tracking branch 'qatar/master'	2011-05-22 04:53:19 +02:00
ffmetadec.c
ffmetaenc.c
file.c	Merge remote branch 'qatar/master'	2011-05-05 03:30:24 +02:00
filmstripdec.c
filmstripenc.c
flacdec.c
flacenc_header.c
flacenc.c
flacenc.h
flic.c
flv.h
flvdec.c	Merge remote-tracking branch 'qatar/master'	2011-05-18 05:42:42 +02:00
flvenc.c
framecrcenc.c
gif.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
gopher.c
gxf.c
gxf.h
gxfenc.c	replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*	2011-05-02 16:41:41 +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	lavf: use designated initializers for AVClasses.	2011-05-17 23:01:42 +02:00
http.h
httpauth.c
httpauth.h
id3v1.c
id3v1.h
id3v2.c	Merge remote-tracking branch 'qatar/master'	2011-05-27 23:48:22 +02:00
id3v2.h
idcin.c
idroqdec.c
idroqenc.c
iff.c	Fix various uninitialized variable warnings	2011-06-02 10:36:56 +02:00
img2.c	Add Kamil Nowosads j2k code.	2011-05-24 01:31:53 +02:00
ingenientdec.c
internal.h	sdp: Allow passing AVFormatContext flags to the SDP generation	2011-05-20 01:44:10 +02:00
ipmovie.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
isom.c	Fix ff_mov_write_chan() so it can be used by other muxers.	2011-05-17 01:47:12 +02:00
isom.h	Fix ff_mov_write_chan() so it can be used by other muxers.	2011-05-17 01:47:12 +02:00
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	examples: move API examples to a dedicated dir in doc	2011-05-30 09:20:06 +02:00
matroska.c	matroska: improve declaration of video_stereo_* constant tables	2011-05-24 23:34:24 +02:00
matroska.h	Merge remote-tracking branch 'qatar/master' into master	2011-05-29 03:34:35 +02:00
matroskadec.c	Fix various uninitialized variable warnings	2011-06-02 10:36:56 +02:00
matroskaenc.c	webm: support stereo videos in matroska/webm muxer	2011-05-28 12:15:55 +02:00
md5enc.c
md5proto.c
metadata.c
metadata.h
microdvddec.c
microdvdenc.c
mm.c
mmf.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
mms.c
mms.h	Merge remote-tracking branch 'qatar/master'	2011-05-22 04:53:19 +02:00
mmsh.c
mmst.c	Add some forgotten const to function arguments in libavfilter & libavformat.	2011-05-17 03:05:36 +02:00
mov.c	Remove unused variables	2011-06-02 20:06:00 +01:00
movenc.c	Merge remote-tracking branch 'qatar/master'	2011-06-01 00:09:05 +02:00
movenc.h	Merge remote-tracking branch 'qatar/master'	2011-05-27 23:48:22 +02:00
movenchint.c
mp3dec.c
mp3enc.c	Merge remote-tracking branch 'qatar/master'	2011-05-21 05:32:03 +02:00
mpc8.c
mpc.c
mpeg.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
mpeg.h
mpegenc.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
mpegts.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
mpegts.h
mpegtsenc.c	Merge remote-tracking branch 'qatar/master'	2011-05-21 05:32:03 +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-06-02 05:12:10 +02:00
mxfenc.c
mxg.c
ncdec.c
network.h	Merge remote-tracking branch 'qatar/master'	2011-05-27 02:53:21 +02:00
nsvdec.c	If a MP3 file contains the string NSVs, the NSV probe will think it is a NSV file instead of a MP3 file. Check for 0xBEEF after a Video/Audio chunck for more accuracy.	2011-05-12 14:37:50 +02:00
nullenc.c
nut.c	nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE	2011-04-28 07:25:28 +02:00
nut.h
nutdec.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
nutenc.c	Simplify condition.	2011-05-07 09:47:35 +02:00
nuv.c
oggdec.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
oggdec.h
oggenc.c	Added oggpagesize option for Ogg encoding. Allows setting a preferred page size. When set, if an Ogg stream buffer has enough data, a page is made, instead of filling maximum-size pages.	2011-05-10 19:30:56 +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
oma.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
options.c	Merge remote-tracking branch 'qatar/master'	2011-05-27 23:48:22 +02:00
os_support.c	Merge remote branch 'qatar/master'	2011-05-13 04:40:40 +02:00
os_support.h	Merge remote branch 'qatar/master'	2011-04-24 03:41:22 +02:00
pcm.c
pcm.h
pcmdec.c	Merge remote-tracking branch 'qatar/master'	2011-05-26 03:28:22 +02:00
pcmenc.c
pmpdec.c
psxstr.c
pva.c
qcp.c
qtpalette.h
r3d.c	Merge remote-tracking branch 'qatar/master'	2011-06-02 05:12:10 +02:00
rawdec.c	Merge remote-tracking branch 'qatar/master' into master	2011-05-29 03:34:35 +02:00
rawdec.h	Merge remote-tracking branch 'qatar/master' into master	2011-05-29 03:34:35 +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 branch 'qatar/master'	2011-04-24 03:41:22 +02:00
rdt.h
riff.c	Add Kamil Nowosads j2k code.	2011-05-24 01:31:53 +02:00
riff.h
rl2.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
rm.c
rm.h
rmdec.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
rmenc.c
rpl.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
rso.c
rso.h
rsodec.c
rsoenc.c
rtmp.h
rtmppkt.c	Merge remote-tracking branch 'qatar/master'	2011-05-26 03:28:22 +02:00
rtmppkt.h
rtmpproto.c	Merge remote-tracking branch 'qatar/master'	2011-05-26 03:28:22 +02:00
rtp.c
rtp.h
rtpdec_amr.c	Merge remote branch 'qatar/master'	2011-04-24 03:41:22 +02:00
rtpdec_asf.c	Merge remote branch 'qatar/master'	2011-04-24 03:41:22 +02:00
rtpdec_formats.h
rtpdec_h263.c
rtpdec_h264.c	Merge remote branch 'qatar/master'	2011-04-24 03:41:22 +02:00
rtpdec_latm.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
rtpdec_mpeg4.c	Merge remote branch 'qatar/master'	2011-04-24 03:41:22 +02:00
rtpdec_qcelp.c	Merge remote branch 'qatar/master'	2011-04-24 03:41:22 +02:00
rtpdec_qdm2.c	Merge remote branch 'qatar/master'	2011-05-13 04:40:40 +02:00
rtpdec_qt.c	Merge remote branch 'qatar/master'	2011-04-24 03:41:22 +02:00
rtpdec_svq3.c	Merge remote branch 'qatar/master'	2011-04-24 03:41:22 +02:00
rtpdec_vp8.c	Merge remote branch 'qatar/master'	2011-04-24 03:41:22 +02:00
rtpdec_xiph.c	Merge remote branch 'qatar/master'	2011-04-24 03:41:22 +02:00
rtpdec.c	Merge remote branch 'qatar/master'	2011-05-13 04:40:40 +02:00
rtpdec.h	Merge remote branch 'qatar/master'	2011-04-24 03:41:22 +02:00
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c	rtpenc_chain: Pass the MP4A_LATM flag to chained muxers	2011-05-20 01:44:10 +02:00
rtpenc_chain.h
rtpenc_h263.c
rtpenc_h264.c
rtpenc_latm.c	rtpenc: MP4A-LATM payload support	2011-05-20 01:44:10 +02:00
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c	rtpenc: MP4A-LATM payload support	2011-05-20 01:44:10 +02:00
rtpenc.h	rtpenc: MP4A-LATM payload support	2011-05-20 01:44:10 +02:00
rtpproto.c	Merge remote branch 'qatar/master'	2011-05-10 04:03:17 +02:00
rtsp.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
rtsp.h	Merge remote-tracking branch 'qatar/master'	2011-05-27 23:48:22 +02:00
rtspcodes.h
rtspdec.c	Merge remote-tracking branch 'qatar/master'	2011-05-27 23:48:22 +02:00
rtspenc.c
sapdec.c
sapenc.c
sauce.c	Merge remote-tracking branch 'qatar/master'	2011-06-03 05:19:30 +02:00
sauce.h
sdp.c	Reindent	2011-05-20 01:44:10 +02:00
seek.c
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
soxenc.c
spdif.c
spdif.h	Merge remote-tracking branch 'qatar/master'	2011-05-22 04:53:19 +02:00
spdifdec.c
spdifenc.c	lavf: use designated initializers for AVClasses.	2011-05-17 23:01:42 +02:00
srtdec.c
swf.h
swfdec.c
swfenc.c	Fix some passing argument from incompatible pointer type warnings.	2011-04-24 17:46:50 +02:00
tcp.c	TCP: change default timeout to 5sec	2011-05-30 02:39:26 +02:00
thp.c
tiertexseq.c
timefilter.c
timefilter.h
tmv.c
tta.c
tty.c	Merge remote-tracking branch 'qatar/master'	2011-05-27 23:48:22 +02:00
txd.c
udp.c	cleaned up the udp.c, removed some variables and an av_log	2011-05-18 17:17:56 +02:00
url.h	Merge remote-tracking branch 'qatar/master'	2011-05-22 04:53:19 +02:00
utils.c	Fix various bad printf format warnings	2011-05-30 00:03:06 +02:00
vc1test.c
vc1testenc.c
version.h	Merge remote-tracking branch 'qatar/master'	2011-05-27 23:48:22 +02:00
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c
vorbiscomment.h
vqf.c
wav.c	wav: Don't avio_seek() if we know we'll run into EOF	2011-05-30 15:44:23 +02:00
wc3movie.c
westwood.c
wtv.c	WTV: Add ff_ prefix to the moved fields.	2011-05-01 21:13:18 +02:00
wtv.h	WTV: Add ff_ prefix to the moved fields.	2011-05-01 21:13:18 +02:00
wtvdec.c	wtvdec: Avoid gmtime_r() it breaks compile on windows.	2011-05-09 04:17:24 +02:00
wv.c
xa.c
xwma.c
yop.c
yuv4mpeg.c	Remove unused variables	2011-06-02 20:06:00 +01:00