Michael Niedermayer 2e0cc34292 Merge commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb' ... * commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb': matroskaenc: cosmetics, reorder the #includes Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-05-03 13:09:23 +02:00
..
4xm.c
a64.c
aacdec.c
ac3dec.c
act.c
adtsenc.c
adxdec.c
aea.c
afc.c
aiff.h
aiffdec.c	Read block_align from extradata when decoding qclp in aiff.	2013-04-23 16:19:26 +02:00
aiffenc.c
allformats.c	lavf: data muxer and demuxer.	2013-05-01 11:56:34 +02:00
amr.c
anm.c
apc.c
ape.c
apetag.c
apetag.h
apetagenc.c
aqtitledec.c
asf.c
asf.h	riff: Move guid structs and helper functions into riff	2013-04-21 18:20:30 +02:00
asfcrypt.c
asfcrypt.h
asfdec.c	Merge commit 'e926b5ceb1962833f0c884a328382bc2eca67aff'	2013-05-01 18:28:48 +02:00
asfenc.c
assdec.c
assenc.c
ast.c
ast.h
astdec.c
astenc.c
au.c
audiointerleave.c	Merge commit 'e926b5ceb1962833f0c884a328382bc2eca67aff'	2013-05-01 18:28:48 +02:00
audiointerleave.h
avc.c
avc.h
avformat.h	avformat/mux: set avoid_negative_ts based on flags if not overridden by user or muxer	2013-04-26 14:51:47 +02:00
avi.h
avidec.c
avienc.c
avio_internal.h
avio.c
avio.h
aviobuf.c
avisynth.c
avlanguage.c
avlanguage.h
avr.c
avs.c
bethsoftvid.c
bfi.c
bink.c
bintext.c
bit.c
bluray.c
bmv.c
boadec.c	avformat: Add black ops audio demuxer	2013-04-28 04:21:29 +02:00
brstm.c
c93.c
cache.c
caf.c
caf.h
cafdec.c
cafenc.c
cavsvideodec.c
cdg.c
cdxl.c
concat.c
concatdec.c
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
epafdec.c
ffm.h
ffmdec.c
ffmenc.c	Merge commit 'c2cb01d418dd18e1cf997c038d37378d773121be'	2013-04-26 10:59:45 +02:00
ffmeta.h
ffmetadec.c
ffmetaenc.c
file.c
filmstripdec.c
filmstripenc.c
flacdec.c
flacenc_header.c
flacenc.c
flacenc.h
flic.c
flv.h
flvdec.c
flvenc.c
framecrcenc.c	framecrcenc: workaround design flaw in sidedata palette	2013-04-30 13:35:14 +02:00
framehash.c
frmdec.c
g722.c
g723_1.c
g729dec.c
gif.c
gifdec.c
gopher.c
gsmdec.c
gxf.c
gxf.h
gxfenc.c
h261dec.c
h263dec.c
h264dec.c
hls.c
hlsenc.c	Merge commit 'cf679b9476727a237c8006c685ace18acba149ab'	2013-04-28 11:48:40 +02:00
hlsproto.c
http.c
http.h
httpauth.c
httpauth.h
icodec.c
icoenc.c
id3v1.c
id3v1.h
id3v2.c	Merge remote-tracking branch 'qatar/master'	2013-05-02 12:49:23 +02:00
id3v2.h
id3v2enc.c
idcin.c
idroqdec.c
idroqenc.c
iff.c
ilbc.c
img2.c
img2dec.c
img2enc.c	Recognize j2k as file suffix for the image2 muxer.	2013-04-29 13:11:32 +02:00
ingenientdec.c
internal.h
ipmovie.c
ircam.c
ircam.h
ircamdec.c
ircamenc.c
isom.c
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
librtmp.c
lmlm4.c
loasdec.c
log2_tab.c
lvfdec.c
lxfdec.c
m4vdec.c
Makefile	lavf: data muxer and demuxer.	2013-05-01 11:56:34 +02:00
matroska.c
matroska.h
matroskadec.c
matroskaenc.c	Merge commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb'	2013-05-03 13:09:23 +02:00
md5enc.c	Merge commit 'c2cb01d418dd18e1cf997c038d37378d773121be'	2013-04-26 10:59:45 +02:00
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
mov_chan.h
mov.c
movenc.c	avformat/movenc: mov/mp4 should support negative timestamps through edit lists	2013-04-26 14:51:47 +02:00
movenc.h
movenchint.c
mp3dec.c
mp3enc.c
mpc8.c
mpc.c
mpeg.c
mpeg.h
mpegenc.c
mpegts.c
mpegts.h
mpegtsenc.c
mpegvideodec.c
mpjpeg.c
mpl2dec.c
mpsubdec.c
msnwc_tcp.c
mtv.c
mux.c	Merge commit 'e926b5ceb1962833f0c884a328382bc2eca67aff'	2013-05-01 18:28:48 +02:00
mvdec.c
mvi.c
mxf.c
mxf.h
mxfdec.c	mxf_timestamp_to_str: dont leave uninitilaized fields in time.	2013-04-21 00:26:20 +02:00
mxfenc.c	avformat: Drop unnecessary ff_ name prefixes from static functions	2013-04-30 16:16:23 +02:00
mxg.c
ncdec.c
network.c
network.h
nistspheredec.c
noproxy-test.c
nsvdec.c
nullenc.c
nut.c
nut.h
nutdec.c	nutdec: Implement duration parsing for indexed nuts	2013-05-02 18:57:29 +02:00
nutenc.c
nuv.c
oggdec.c
oggdec.h
oggenc.c	Merge commit 'c2cb01d418dd18e1cf997c038d37378d773121be'	2013-04-26 10:59:45 +02:00
oggparsecelt.c
oggparsedirac.c
oggparseflac.c
oggparseogm.c
oggparseopus.c
oggparseskeleton.c
oggparsespeex.c
oggparsetheora.c
oggparsevorbis.c
oma.c
oma.h
omadec.c	Merge commit 'c14010541035454b4d3ad08399d70423be4e0c87'	2013-04-28 12:18:18 +02:00
omaenc.c
options_table.h
options.c
os_support.c
os_support.h
paf.c
pcm.c
pcm.h
pcmdec.c
pcmenc.c
pjsdec.c
pmpdec.c
psxstr.c
pva.c
pvfdec.c
qcp.c
qtpalette.h
r3d.c
rawdec.c	lavf: data muxer and demuxer.	2013-05-01 11:56:34 +02:00
rawdec.h
rawenc.c	lavf: data muxer and demuxer.	2013-05-01 11:56:34 +02:00
rawenc.h
rawvideodec.c
rdt.c	Merge commit 'e926b5ceb1962833f0c884a328382bc2eca67aff'	2013-05-01 18:28:48 +02:00
rdt.h
realtextdec.c
riff.c	Merge commit 'b845f5e97b655de0a191f736594777fec9754cf5'	2013-04-22 12:53:58 +02:00
riff.h	Merge commit 'e544782623caf1eb4b2429e9c4f35d6b627accba'	2013-04-22 12:20:04 +02:00
rl2.c
rm.c
rm.h
rmdec.c
rmenc.c
rmsipr.c
rmsipr.h
rpl.c
rso.c
rso.h
rsodec.c
rsoenc.c
rtmp.h
rtmpcrypt.c
rtmpcrypt.h
rtmpdh.c
rtmpdh.h
rtmphttp.c
rtmppkt.c	Merge commit 'e926b5ceb1962833f0c884a328382bc2eca67aff'	2013-05-01 18:28:48 +02:00
rtmppkt.h
rtmpproto.c
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
rtpdec_mpeg4.c
rtpdec_mpeg12.c
rtpdec_mpegts.c
rtpdec_qcelp.c
rtpdec_qdm2.c
rtpdec_qt.c
rtpdec_svq3.c
rtpdec_vp8.c
rtpdec_xiph.c
rtpdec.c
rtpdec.h
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
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c
rtpenc.h
rtpproto.c
rtsp.c	Merge commit 'e926b5ceb1962833f0c884a328382bc2eca67aff'	2013-05-01 18:28:48 +02:00
rtsp.h
rtspcodes.h
rtspdec.c
rtspenc.c
samidec.c
sapdec.c
sapenc.c
sauce.c
sauce.h
sbgdec.c
sctp.c
sdp.c
seek-test.c
seek.c
seek.h
segafilm.c
segment.c	hls, segment: fix splitting for audio-only streams.	2013-04-27 10:19:04 +02:00
sierravmd.c
siff.c
smacker.c
smjpeg.c
smjpeg.h
smjpegdec.c
smjpegenc.c
smoothstreamingenc.c
smush.c
sol.c
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c
spdifenc.c
srtdec.c
srtenc.c
srtp.c
srtp.h
srtpproto.c
subtitles.c
subtitles.h
subviewer1dec.c
subviewerdec.c
swf.c
swf.h
swfdec.c
swfenc.c
takdec.c
tcp.c
tedcaptionsdec.c
tee.c
thp.c
tiertexseq.c
tls.c
tmv.c
tta.c
tty.c
txd.c
udp.c
url-test.c
url.h
urldecode.c
urldecode.h
utils.c	avformat: fix orig_pos type to match pkt->pos	2013-04-23 13:56:34 +00:00
vc1test.c
vc1testenc.c
version.h	lavf: data muxer and demuxer.	2013-05-01 11:56:34 +02:00
vivo.c
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c
vorbiscomment.h
vplayerdec.c
vqf.c
w64.c	Merge commit '13f57a4d881ec669b87bf82f424bfff502433060'	2013-05-03 11:06:27 +02:00
w64.h
wavdec.c	Merge commit '13f57a4d881ec669b87bf82f424bfff502433060'	2013-05-03 11:06:27 +02:00
wavenc.c
wc3movie.c
webvttdec.c
westwood_aud.c
westwood_vqa.c
wtv.c	riff: Move guid structs and helper functions into riff	2013-04-21 18:20:30 +02:00
wtv.h
wtvdec.c
wtvenc.c
wv.c
wvenc.c
xa.c
xmv.c
xwma.c
yop.c
yuv4mpeg.c