Michael Niedermayer 580a0600ef Merge remote-tracking branch 'qatar/master' ... * qatar/master: Move misplaced file author information where it belongs Conflicts: libavcodec/adpcm.c libavcodec/adpcmenc.c libavcodec/gif.c libavcodec/x86/dsputilenc_mmx.c libavcodec/x86/fmtconvert_init.c libavformat/au.c libavformat/gif.c libavformat/mov.c libavformat/nsvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-04-11 15:56:18 +02: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	Skip padding in an id3 tag in aiff files.	2013-04-03 15:45:46 +02:00
aiffenc.c
allformats.c	lavf: add libquvi demuxer.	2013-04-10 12:09:20 +02:00
amr.c
anm.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
apc.c
ape.c	ape: use correct context for the bit table printed in debug	2013-03-27 16:20:08 +01:00
apetag.c
apetag.h
apetagenc.c
aqtitledec.c	Replace all occurrences of PRI in sscanf() calls with SCN	2013-04-10 09:56:48 +02:00
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c
asfenc.c	asfenc: convert asserts to av_assert	2013-04-07 03:59:44 +02: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 remote-tracking branch 'qatar/master'	2013-04-11 15:56:18 +02:00
audiointerleave.c
audiointerleave.h
avc.c
avc.h
avformat.h	avformat: Add a mechanism to allow demuxers to detect byte based seeking.	2013-04-04 04:04:24 +02:00
avi.h
avidec.c	avidec: Fix demuxing of non seekable avis with multiple RIFFs	2013-03-28 17:30:42 +01:00
avienc.c
avio_internal.h
avio.c
avio.h	avio.h: fix indention	2013-04-08 14:15:10 +02:00
aviobuf.c	avformat: add writeout_count statistic	2013-04-08 13:30:40 +02:00
avisynth.c	avformat/avisynth: Cosmetics	2013-04-10 02:25:34 +02:00
avlanguage.c
avlanguage.h
avr.c	lavc & lavf: replace deprecated av_log* functions	2013-03-15 18:10:28 +00:00
avs.c	avformat/avs: increase probe score to preempt conflict with avxsynth	2013-03-21 04:05:51 +01:00
bethsoftvid.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
bfi.c
bink.c
bintext.c	bintext: make use of AV_OPT_TYPE_IMAGE_SIZE	2013-04-05 15:42:24 +00:00
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	lavf/concatdec: support seeking.	2013-03-20 20:59:24 +01:00
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	electronicarts: check timebase, fix assertion failure	2013-03-28 01:08:46 +01: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	flvdec: fix seeking in audio only files	2013-04-03 03:57:37 +02:00
flvenc.c	flvenc: dont call avio_flush() unconditional	2013-04-08 13:31:53 +02:00
framecrcenc.c
framehash.c
frmdec.c
g722.c
g723_1.c
g729dec.c
gif.c	Merge remote-tracking branch 'qatar/master'	2013-04-11 15:56:18 +02:00
gifdec.c
gopher.c
gsmdec.c
gxf.c
gxf.h
gxfenc.c
h261dec.c
h263dec.c
h264dec.c
hls.c
hlsenc.c
hlsproto.c	Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201'	2013-03-13 12:21:43 +01:00
http.c	lavf/http: use a more compatible default user agent.	2013-04-06 21:08:32 +02:00
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	Merge commit '8d617b11cfc87b2c6056fee029ac5bc760af874a'	2013-04-04 13:41:01 +02:00
id3v2.h
id3v2enc.c
idcin.c	Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'	2013-03-12 15:44:15 +01:00
idroqdec.c
idroqenc.c
iff.c	Merge commit '50c449ac24fbb4c03c15d2e2026cef2204b80385'	2013-03-18 17:30:53 +01:00
ilbc.c
img2.c	Merge commit '8c65264595d5a82c56ae5043320e4b875a414229'	2013-04-05 12:39:06 +02:00
img2dec.c	img2dec: make use of AV_OPT_TYPE_IMAGE_SIZE	2013-04-05 15:42:25 +00:00
img2enc.c
ingenientdec.c
internal.h
ipmovie.c
ircam.c
ircam.h
ircamdec.c
ircamenc.c
isom.c	libspeex: support ZygoAudio (quality 10 mode)	2013-03-23 15:45:58 +01:00
isom.h
iss.c
iv8.c
ivfdec.c
ivfenc.c
jacosubdec.c
jacosubenc.c
jvdec.c
latmenc.c
libavformat.v
libmodplug.c
libnut.c
libquvi.c	lavf: add libquvi demuxer.	2013-04-10 12:09:20 +02:00
librtmp.c
lmlm4.c	lmlm4: check packet_size against lower limit too	2013-03-19 16:30:44 +01:00
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	lavf: add libquvi demuxer.	2013-04-10 12:09:20 +02:00
matroska.c
matroska.h	matroskadec: Add support for parsing Matroska ContentEncKeyID	2013-03-20 21:29:55 +01:00
matroskadec.c	matroskadec: Check EBML lace sizes.	2013-04-04 15:51:04 +02: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	Fix termination of mov_ch_layouts_wav array lookup	2013-03-18 23:50:35 +01:00
mov_chan.h
mov.c	Merge remote-tracking branch 'qatar/master'	2013-04-11 15:56:18 +02:00
movenc.c	Write broken aac frames to mov files instead of skipping them.	2013-03-30 14:29:15 +01:00
movenc.h
movenchint.c
mp3dec.c
mp3enc.c
mpc8.c
mpc.c
mpeg.c	Replace all occurrences of PRI in sscanf() calls with SCN	2013-04-10 09:56:48 +02: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	mpegtsenc: Only test the first frame for missing h264_mp4toannexb filter.	2013-03-26 15:15:46 +01:00
mpegvideodec.c
mpjpeg.c
mpl2dec.c	Replace all occurrences of PRI in sscanf() calls with SCN	2013-04-10 09:56:48 +02:00
mpsubdec.c
msnwc_tcp.c
mtv.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
mux.c	mux: also call avio_flush() when flushing the muxer	2013-04-08 13:31:12 +02:00
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	mxfdec: update current edit unit when seeking in mxf files without index tables	2013-04-11 13:35:58 +02: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	Merge remote-tracking branch 'qatar/master'	2013-04-11 15:56:18 +02:00
nullenc.c
nut.c
nut.h
nutdec.c
nutenc.c
nuv.c	lavf: remove disabled FF_API_R_FRAME_RATE cruft	2013-03-11 18:23:50 +01:00
oggdec.c	oggdec: Support byte based seeking	2013-04-04 04:04:24 +02:00
oggdec.h
oggenc.c
oggparsecelt.c
oggparsedirac.c
oggparseflac.c
oggparseogm.c
oggparseopus.c
oggparseskeleton.c	Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'	2013-03-14 12:30:19 +01:00
oggparsespeex.c
oggparsetheora.c
oggparsevorbis.c
oma.c	Merge remote-tracking branch 'qatar/master'	2013-04-01 12:48:04 +02:00
oma.h	oma: Validate sample rates	2013-03-31 16:10:52 +02:00
omadec.c	Merge remote-tracking branch 'qatar/master'	2013-04-01 12:48:04 +02:00
omaenc.c
options_table.h	lavf/mux: add the flush_packets option.	2013-03-24 23:19:07 +01:00
options.c
os_support.c	Merge commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107'	2013-03-28 12:26:36 +01:00
os_support.h	win32: Use 64-bit fstat/lseek variants for MSVC as well	2013-03-27 19:05:58 +02:00
paf.c
pcm.c
pcm.h
pcmdec.c
pcmenc.c
pjsdec.c	Replace all occurrences of PRI in sscanf() calls with SCN	2013-04-10 09:56:48 +02:00
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	lavf: remove disabled FF_API_R_FRAME_RATE cruft	2013-03-11 18:23:50 +01:00
rawdec.c	rawdec: make use of AV_OPT_TYPE_VIDEO_RATE	2013-04-05 15:42:24 +00:00
rawdec.h	rawdec: make use of AV_OPT_TYPE_VIDEO_RATE	2013-04-05 15:42:24 +00:00
rawenc.c	Add raw VC-1 muxer to match demuxer.	2013-03-16 13:42:53 +01:00
rawenc.h
rawvideodec.c	rawvideodec: make use of AV_OPT_TYPE_IMAGE_SIZE	2013-04-05 15:42:24 +00:00
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	Replace all occurrences of PRI in sscanf() calls with SCN	2013-04-10 09:56:48 +02:00
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	Merge remote-tracking branch 'qatar/master'	2013-03-20 12:03:53 +01:00
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	rtpdec: Increase max rtp packet size to 8192	2013-04-09 10:36:56 +03:00
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	Merge commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0'	2013-03-26 13:44:09 +01:00
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c
rtpenc.h
rtpproto.c
rtsp.c	lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500	2013-04-09 10:36:43 +03:00
rtsp.h	rtsp: add option to set the socket timeout of the lower protocol.	2013-04-08 17:45:13 +02:00
rtspcodes.h
rtspdec.c
rtspenc.c
samidec.c
sapdec.c	Merge remote-tracking branch 'qatar/master'	2013-04-09 11:36:39 +02:00
sapenc.c
sauce.c
sauce.h
sbgdec.c
sctp.c
sdp.c
seek-test.c
seek.c
seek.h
segafilm.c
segment.c	segment: copy metadata	2013-03-18 23:57:44 +01:00
sierravmd.c
siff.c
smacker.c	smacker: fix off by one error	2013-04-03 13:01:38 +00:00
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	Merge remote-tracking branch 'qatar/master'	2013-04-09 11:36:39 +02:00
srtp.h
srtpproto.c	Merge remote-tracking branch 'qatar/master'	2013-04-09 11:36:39 +02:00
subtitles.c
subtitles.h
subviewer1dec.c
subviewerdec.c
swf.c
swf.h
swfdec.c
swfenc.c
takdec.c
tcp.c	avformat/avdevice: add missing time.h includes	2013-03-12 15:28:22 +01:00
tedcaptionsdec.c	lavf: add AV_ to two remaining CODEC_ID_*.	2013-03-12 16:21:22 +01:00
tee.c	avformat/tee: add forgotten ret assignment	2013-03-19 15:09:10 +01:00
thp.c
tiertexseq.c
tls.c
tmv.c
tta.c
tty.c	tty: make use of AV_OPT_TYPE_IMAGE_SIZE	2013-04-05 14:30:56 +00:00
txd.c
udp.c	avformat/avdevice: add missing time.h includes	2013-03-12 15:28:22 +01:00
url-test.c
url.h
urldecode.c
urldecode.h
utils.c	Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'	2013-04-04 13:24:33 +02:00
vc1test.c
vc1testenc.c	vc1testenc: give muxer same name as demuxer	2013-03-16 13:42:16 +01:00
version.h	lavf: add libquvi demuxer.	2013-04-10 12:09:20 +02:00
vivo.c
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c
vorbiscomment.h
vplayerdec.c
vqf.c
w64.c
w64.h
wavdec.c	lavf/wavdec: skip padding byte	2013-04-08 20:13:40 +02:00
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 remote-tracking branch 'qatar/master'	2013-04-04 14:35:40 +02:00
xwma.c	Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'	2013-03-14 12:41:34 +01:00
yop.c	yop: Do not keep a copy of parts of the returned packet	2013-03-29 02:11:34 +01:00
yuv4mpeg.c