Michael Niedermayer 93342de1d8 Merge remote-tracking branch 'qatar/master' ... * qatar/master: rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE code rtmp: Move the CONFIG_ condition into the if conditions aac: Mention abbreviation as well in long_name build: Skip compiling rtmpdh.h if ffrtmpcrypt protocol is not enabled doc: Add Git configuration section configure: Add a dependency on https for rtmpts rtp: Only choose static payload types if the sample rate and channels are right Conflicts: doc/git-howto.texi libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-07-24 21:15:57 +02:00
..
4xm.c	4xm: fix division by zero caused by bps<8	2012-05-29 19:56:07 +02:00
a64.c
aacdec.c
ac3dec.c	ac3_probe: speedup by checking for header earlier	2012-05-31 16:14:27 +02:00
act.c
adtsenc.c	Merge remote-tracking branch 'qatar/master'	2012-06-03 02:56:52 +02:00
adxdec.c
aea.c
aiff.h
aiffdec.c	Merge remote-tracking branch 'qatar/master'	2012-07-19 23:31:04 +02:00
aiffenc.c
allformats.c	Merge remote-tracking branch 'qatar/master'	2012-07-23 21:25:09 +02:00
amr.c	Merge remote-tracking branch 'qatar/master'	2012-06-18 20:07:00 +02:00
anm.c
apc.c
ape.c	Merge remote-tracking branch 'qatar/master'	2012-06-24 21:34:54 +02:00
apetag.c	Merge remote-tracking branch 'qatar/master'	2012-07-02 21:19:41 +02:00
apetag.h
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c	Merge remote-tracking branch 'qatar/master'	2012-07-02 21:19:41 +02:00
asfenc.c	lavf: use conditional notation for default codec in muxer declarations.	2012-07-22 16:10:21 -07:00
assdec.c
assenc.c
au.c
audiointerleave.c
audiointerleave.h
avc.c
avc.h
avformat.h	lavf: make cmdutils's check_stream_specifier public.	2012-07-20 13:16:23 +02:00
avi.h
avidec.c	avidec: Mark first frame as keyframe in case there are no keyframes.	2012-07-19 18:44:46 +02:00
avienc.c	Merge remote-tracking branch 'qatar/master'	2012-07-23 21:25:09 +02:00
avio_internal.h
avio.c	Merge remote-tracking branch 'qatar/master'	2012-06-22 22:34:02 +02:00
avio.h	avio: av_protocol_next() is gone	2012-06-20 01:56:03 +00:00
aviobuf.c	cosmetics: various spelling fixes	2012-07-06 17:08:22 +02:00
avisynth.c	Add missing CRLFs to avisynth error messages.	2012-06-05 11:13:30 +02:00
avlanguage.c
avlanguage.h
avs.c
bethsoftvid.c
bfi.c
bink.c	bink: check av_mallocz() return value	2012-06-09 10:57:14 +00:00
bintext.c	lavf/bintext: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata	2012-06-09 14:36:41 +02:00
bit.c
bluray.c
bmv.c
c93.c
cache.c
caf.c
caf.h
cafdec.c	Merge remote-tracking branch 'qatar/master'	2012-07-21 04:25:11 +02:00
cafenc.c
cavsvideodec.c
cdg.c
cdxl.c	Replace Libav with FFmpeg in license headers for files created by me	2012-06-29 01:58:34 +00:00
concat.c
crcenc.c
crypto.c
cutils.c
daud.c
dfa.c
diracdec.c
dnxhddec.c
dsicin.c
dtsdec.c
dv.c	dv-demux: dont mess with codec values	2012-05-31 23:50:08 +02:00
dv.h
dvenc.c	timecode: move timecode muxer options to metadata.	2012-06-04 07:41:22 +02:00
dxa.c
eacdata.c
electronicarts.c
ffm.h
ffmdec.c
ffmenc.c	ffmenc: use av_assert	2012-06-16 17:59:01 +02:00
ffmeta.h
ffmetadec.c
ffmetaenc.c
file.c	lavf/file: cosmetic: Use "not" instead of "equals zero"	2012-07-05 10:55:49 +02:00
filmstripdec.c
filmstripenc.c
flacdec.c	Merge remote-tracking branch 'qatar/master'	2012-07-08 22:33:32 +02:00
flacenc_header.c
flacenc.c
flacenc.h
flic.c
flv.h	Merge remote-tracking branch 'qatar/master'	2012-06-28 23:57:31 +02:00
flvdec.c	Merge remote-tracking branch 'qatar/master'	2012-07-07 02:17:30 +02:00
flvenc.c	Merge remote-tracking branch 'qatar/master'	2012-07-23 21:25:09 +02:00
framecrcenc.c
framehash.c
g723_1.c	Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'	2012-07-22 22:18:18 +02:00
g729dec.c
gif.c
gopher.c
gsmdec.c
gxf.c
gxf.h
gxfenc.c	timecode: move timecode muxer options to metadata.	2012-06-04 07:41:22 +02:00
h261dec.c
h263dec.c
h264dec.c
hls.c	cosmetics: various spelling fixes	2012-07-06 17:08:22 +02:00
hlsproto.c	cosmetics: various spelling fixes	2012-07-06 17:08:22 +02:00
http.c	http: try to detect live akamai streams and dont enable seeking for them	2012-06-28 00:18:24 +02:00
http.h	cosmetics: various spelling fixes	2012-07-06 17:08:22 +02:00
httpauth.c
httpauth.h
icodec.c
id3v1.c
id3v1.h
id3v2.c	Merge remote-tracking branch 'qatar/master'	2012-07-08 22:33:32 +02:00
id3v2.h
id3v2enc.c
idcin.c
idroqdec.c
idroqenc.c
iff.c	cosmetics: iff: split very long line	2012-07-23 21:46:28 +00:00
ilbc.c	Merge remote-tracking branch 'qatar/master'	2012-06-19 20:53:27 +02:00
img2.c	Recognize yuv10 image files as v210x.	2012-07-10 13:27:16 +02:00
img2dec.c	Merge remote-tracking branch 'qatar/master'	2012-06-24 21:34:54 +02:00
img2enc.c	Merge remote-tracking branch 'qatar/master'	2012-06-24 21:34:54 +02:00
ingenientdec.c
internal.h
ipmovie.c	ipmovie_probe: speedup by avoiding memcmp() call	2012-05-31 16:19:26 +02:00
isom.c	Merge remote-tracking branch 'qatar/master'	2012-07-19 23:31:04 +02:00
isom.h	Merge remote-tracking branch 'qatar/master'	2012-07-19 23:31:04 +02:00
iss.c
iv8.c
ivfdec.c	Merge remote-tracking branch 'qatar/master'	2012-06-21 22:37:43 +02:00
ivfenc.c
jacosubdec.c	lavf/jacosubdec: fix FPE in case timeres is badly set.	2012-06-29 20:19:59 +02:00
jacosubenc.c
jvdec.c	jvdec: fix memleak of jv->frames	2012-07-03 09:53:42 +00:00
latmenc.c
libavformat.v	FireWire DV/HDV input device using libiec61883	2012-07-05 13:02:49 +02:00
libmodplug.c
libnut.c
librtmp.c	Merge remote-tracking branch 'qatar/master'	2012-06-04 00:33:42 +02:00
lmlm4.c
loasdec.c
lxfdec.c
m4vdec.c
Makefile	Merge remote-tracking branch 'qatar/master'	2012-07-24 21:15:57 +02:00
matroska.c	matroska: add support for Opus.	2012-07-20 11:19:01 +02:00
matroska.h
matroskadec.c	Merge remote-tracking branch 'qatar/master'	2012-07-22 23:56:21 +02:00
matroskaenc.c	Merge remote-tracking branch 'qatar/master'	2012-07-23 21:25:09 +02:00
md5enc.c
md5proto.c
metadata.c
metadata.h
mgsts.c
microdvddec.c	lavf/microdvd: rewrite using subtitles queue API.	2012-06-29 20:20:01 +02:00
microdvdenc.c
mkvtimestamp_v2.c
mm.c
mmf.c
mms.c
mms.h
mmsh.c
mmst.c	Merge remote-tracking branch 'qatar/master'	2012-06-20 20:47:46 +02:00
mov_chan.c	avformat: move 'chan' tag parsing to mov_chan.c to share with the CAF demuxer	2012-07-19 13:26:45 -04:00
mov_chan.h	avformat: move 'chan' tag parsing to mov_chan.c to share with the CAF demuxer	2012-07-19 13:26:45 -04:00
mov.c	Merge remote-tracking branch 'qatar/master'	2012-07-19 23:31:04 +02:00
movenc.c	Merge remote-tracking branch 'qatar/master'	2012-07-23 21:25:09 +02:00
movenc.h	movenc: add timecode track support.	2012-06-11 07:35:14 +02:00
movenchint.c	Merge remote-tracking branch 'qatar/master'	2012-05-26 22:37:37 +02:00
mp3dec.c	mp3enc: add lame tag with start padding info	2012-07-14 17:20:22 +02:00
mp3enc.c	mp3enc: add lame tag with start padding info	2012-07-14 17:20:22 +02:00
mpc8.c	Merge remote-tracking branch 'qatar/master'	2012-06-27 01:58:09 +02:00
mpc.c
mpeg.c	Merge remote-tracking branch 'qatar/master'	2012-07-16 20:45:41 +02:00
mpeg.h
mpegenc.c	Merge remote-tracking branch 'qatar/master'	2012-07-22 05:05:02 +02:00
mpegts.c	Merge remote-tracking branch 'qatar/master'	2012-06-19 20:53:27 +02:00
mpegts.h
mpegtsenc.c	mpegtsenc: use av_assert	2012-06-13 18:51:38 +02:00
mpegvideodec.c
mpjpeg.c
msnwc_tcp.c
mtv.c
mvi.c
mxf.c	mxfdec: set pixel format for cdci picture formats	2012-07-10 13:51:04 +02:00
mxf.h	mxfdec: fix frame height vs field height confusion	2012-07-10 13:51:04 +02:00
mxfdec.c	mxfdec: simplify code by using av_calloc()	2012-07-19 18:44:46 +02:00
mxfenc.c	mxfenc: switch to av_assert	2012-07-12 23:16:52 +02:00
mxg.c
ncdec.c
network.c	Merge remote-tracking branch 'qatar/master'	2012-06-27 01:58:09 +02:00
network.h	Merge remote-tracking branch 'qatar/master'	2012-07-16 20:45:41 +02:00
nsvdec.c
nullenc.c
nut.c	nut: add 12/14 bit yuv to nut/raw	2012-07-05 04:23:55 +02:00
nut.h
nutdec.c	nutdec: set duration_estimation_method	2012-06-30 18:58:52 +02:00
nutenc.c	Merge remote-tracking branch 'qatar/master'	2012-07-23 21:25:09 +02:00
nuv.c
oggdec.c	oggdec: add support for Opus codec.	2012-07-20 11:16:52 +02:00
oggdec.h	oggdec: add support for Opus codec.	2012-07-20 11:16:52 +02:00
oggenc.c
oggparsecelt.c
oggparsedirac.c
oggparseflac.c
oggparseogm.c
oggparseopus.c	oggdec: add support for Opus codec.	2012-07-20 11:16:52 +02:00
oggparseskeleton.c
oggparsespeex.c
oggparsetheora.c
oggparsevorbis.c	oggparsevorbis: fix null ptr dereference	2012-05-31 20:25:23 +02:00
oma.c
oma.h
omadec.c
omaenc.c
options_table.h
options.c	lavf: add proper enum type for fmt ctx duration esitmation method	2012-06-28 09:59:53 +02:00
os_support.c	Merge remote-tracking branch 'qatar/master'	2012-07-18 22:34:48 +02:00
os_support.h	Merge remote-tracking branch 'qatar/master'	2012-06-30 22:44:18 +02:00
paf.c	paf: properly flag video packets	2012-07-08 20:49:04 +00:00
pcm.c
pcm.h
pcmdec.c	pcmdec: use av_assert()	2012-06-14 23:52:23 +02:00
pcmenc.c
pmpdec.c
psxstr.c
pva.c
qcp.c
qtpalette.h
r3d.c
rawdec.c	rawdec: use av_assert()	2012-06-14 23:52:40 +02:00
rawdec.h
rawenc.c	lavf: add a real SRT muxer.	2012-06-21 20:52:56 +02:00
rawenc.h
rawvideodec.c
rdt.c
rdt.h
realtextdec.c	RealText demuxer and decoder.	2012-06-29 20:22:04 +02:00
riff.c	riff: fix remuxing of G723_1 in wav	2012-07-24 18:53:53 +02:00
riff.h	libavformat: ff_get_bmp_header: return esize too	2012-05-31 00:46:02 +02:00
rl2.c
rm.c
rm.h
rmdec.c	avf:rmdec.c fill duration to AVFormatContext	2012-07-17 16:47:20 +02:00
rmenc.c
rpl.c
rso.c
rso.h
rsodec.c
rsoenc.c
rtmp.h	Merge remote-tracking branch 'qatar/master'	2012-07-23 21:25:09 +02:00
rtmpcrypt.c	Merge remote-tracking branch 'qatar/master'	2012-07-24 21:15:57 +02:00
rtmpcrypt.h	Merge remote-tracking branch 'qatar/master'	2012-07-23 21:25:09 +02:00
rtmpdh.c	Merge remote-tracking branch 'qatar/master'	2012-07-24 21:15:57 +02:00
rtmpdh.h	Merge remote-tracking branch 'qatar/master'	2012-07-23 21:25:09 +02:00
rtmphttp.c	Merge remote-tracking branch 'qatar/master'	2012-07-18 01:27:19 +02:00
rtmppkt.c	Merge remote-tracking branch 'qatar/master'	2012-06-15 00:14:21 +02:00
rtmppkt.h	Merge remote-tracking branch 'qatar/master'	2012-06-15 00:14:21 +02:00
rtmpproto.c	Merge remote-tracking branch 'qatar/master'	2012-07-24 21:15:57 +02:00
rtp.c	Merge remote-tracking branch 'qatar/master'	2012-07-24 21:15:57 +02:00
rtp.h	Merge remote-tracking branch 'qatar/master'	2012-07-04 00:32:31 +02:00
rtpdec_amr.c
rtpdec_asf.c
rtpdec_formats.h	Merge remote-tracking branch 'qatar/master'	2012-06-19 20:53:27 +02:00
rtpdec_g726.c
rtpdec_h263_rfc2190.c	rtpdec: Don't require frames to start with a Mode A packet	2012-06-14 22:11:43 +03:00
rtpdec_h263.c
rtpdec_h264.c	Merge remote-tracking branch 'qatar/master'	2012-06-20 20:47:46 +02:00
rtpdec_ilbc.c	Merge remote-tracking branch 'qatar/master'	2012-06-19 20:53:27 +02:00
rtpdec_latm.c
rtpdec_mpeg4.c	cosmetics: various spelling fixes	2012-07-06 17:08:22 +02:00
rtpdec_qcelp.c
rtpdec_qdm2.c
rtpdec_qt.c
rtpdec_svq3.c
rtpdec_vp8.c
rtpdec_xiph.c
rtpdec.c	rtpdec: Don't explicitly include unistd.h any longer	2012-06-29 15:38:10 +03:00
rtpdec.h
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c	Merge remote-tracking branch 'qatar/master'	2012-05-26 22:37:37 +02:00
rtpenc_chain.h	Merge remote-tracking branch 'qatar/master'	2012-05-26 22:37:37 +02:00
rtpenc_h263_rfc2190.c
rtpenc_h263.c	Change all uses of restrict to use av_restrict instead.	2012-06-17 00:38:39 +02:00
rtpenc_h264.c	Merge remote-tracking branch 'qatar/master'	2012-06-18 20:07:00 +02:00
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c	Merge remote-tracking branch 'qatar/master'	2012-07-22 05:05:02 +02:00
rtpenc.h	Merge remote-tracking branch 'qatar/master'	2012-07-22 05:05:02 +02:00
rtpproto.c	Merge remote-tracking branch 'qatar/master'	2012-06-20 20:47:46 +02:00
rtsp.c	Merge remote-tracking branch 'qatar/master'	2012-07-22 05:05:02 +02:00
rtsp.h	Merge remote-tracking branch 'qatar/master'	2012-07-11 23:57:11 +02:00
rtspcodes.h	Merge remote-tracking branch 'qatar/master'	2012-07-11 23:57:11 +02:00
rtspdec.c	Merge remote-tracking branch 'qatar/master'	2012-07-11 23:57:11 +02:00
rtspenc.c	Merge remote-tracking branch 'qatar/master'	2012-06-20 20:47:46 +02:00
samidec.c	SAMI demuxer and decoder.	2012-06-29 20:21:28 +02:00
sapdec.c	Merge remote-tracking branch 'qatar/master'	2012-06-20 20:47:46 +02:00
sapenc.c	Merge remote-tracking branch 'qatar/master'	2012-05-26 22:37:37 +02:00
sauce.c
sauce.h
sbgdec.c
sctp.c	network: Include unistd.h from network.h	2012-06-26 17:22:21 +03:00
sdp.c	Merge remote-tracking branch 'qatar/master'	2012-06-19 20:53:27 +02:00
seek-test.c
seek.c
seek.h
segafilm.c
segment.c	lavf/segment: add -segment_time_delta option	2012-07-10 00:53:01 +02:00
sierravmd.c
siff.c
smacker.c
smjpeg.c
smjpeg.h	Replace Libav with FFmpeg in license headers for files created by me	2012-06-29 01:58:34 +00:00
smjpegdec.c	Replace Libav with FFmpeg in license headers for files created by me	2012-06-29 01:58:34 +00:00
smjpegenc.c	Replace Libav with FFmpeg in license headers for files created by me	2012-06-29 01:58:34 +00:00
smush.c	smush: properly flag audio packets	2012-07-08 20:49:35 +00:00
sol.c
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c
spdifenc.c
srtdec.c	lavf/{srt,microdvd}: correctly raise error on avformat_new_stream() error.	2012-06-15 18:40:14 +02:00
srtenc.c	lavf: add a real SRT muxer.	2012-06-21 20:52:56 +02:00
subtitles.c	lavf/subtitles: add some SMIL helpers.	2012-06-29 20:20:02 +02:00
subtitles.h	lavf/subtitles: add some SMIL helpers.	2012-06-29 20:20:02 +02:00
swf.h
swfdec.c
swfenc.c	swfenc: use av_assert	2012-06-07 21:30:07 +02:00
tcp.c	Merge remote-tracking branch 'qatar/master'	2012-07-09 22:40:12 +02:00
thp.c
tiertexseq.c
tls.c	tls: TLS/SSL server	2012-07-22 19:12:15 +02:00
tmv.c
tta.c
tty.c
txd.c
udp.c	udp: fix compilation when HAVE_PTHREAD_CANCEL isnt defined	2012-07-20 14:58:11 +02:00
url.h	url: add ffurl_closep() which also sets the context pointer to NULL	2012-06-01 14:47:30 +02:00
utils.c	Revert "lavf: count skipped samples for initial timestamps."	2012-07-24 17:10:38 +02:00
vc1test.c
vc1testenc.c
version.h	Merge remote-tracking branch 'qatar/master'	2012-07-23 21:25:09 +02:00
voc.c
voc.h
vocdec.c
vocenc.c	vocenc: use new header from codec tag 4	2012-06-25 03:45:29 +02:00
vorbiscomment.c
vorbiscomment.h
vqf.c
wav.c	wav: init st to NULL to avoid a false-positive warning.	2012-07-23 11:34:08 -04:00
wc3movie.c
westwood_aud.c
westwood_vqa.c
wtv.c	wtv: Check the return value from gmtime	2012-06-25 16:20:08 +03:00
wtv.h
wtvdec.c	cosmetics: various spelling fixes	2012-07-06 17:08:22 +02:00
wtvenc.c
wv.c
xa.c
xmv.c	cosmetics: various spelling fixes	2012-07-06 17:08:22 +02:00
xwma.c
yop.c	yop_probe: check more fields to avoid detecting random data as yop	2012-05-31 14:47:15 +02:00
yuv4mpeg.c	Fix yuv4mpeg parsing of 'mono16' files.	2012-07-22 09:59:25 +02:00