Michael Niedermayer 2230d85ceb Merge remote-tracking branch 'qatar/master' ... * qatar/master: matroskaenc: Allow chapters to be written in trailer Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-09-05 13:34:37 +02:00
..
4xm.c	Merge commit 'd719981273bc779c7d1e879d88404fd867f93a0e'	2013-09-04 12:20:53 +02:00
Makefile	avformat: H265 demuxer	2013-09-03 19:34:04 +02:00
a64.c	…
aacdec.c	…
ac3dec.c	…
act.c	…
adp.c	…
adtsenc.c	…
adxdec.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
aea.c	…
afc.c	…
aiff.h	…
aiffdec.c	…
aiffenc.c	…
allformats.c	avformat: H265 demuxer	2013-09-03 19:34:04 +02:00
amr.c	…
anm.c	…
apc.c	…
ape.c	Merge commit '488b2984fece7ad0c2596826fee18e74aa904667'	2013-09-03 14:58:55 +02:00
apetag.c	…
apetag.h	…
aqtitledec.c	…
asf.c	…
asf.h	asfdec: Skip to keyframe after seeking	2013-07-30 15:29:12 +02:00
asfcrypt.c	…
asfcrypt.h	…
asfdec.c	avformat/asfdec: call ff_read_frame_flush() in asf_read_pts()	2013-08-12 22:52:23 +02:00
asfenc.c	…
assdec.c	…
assenc.c	…
ast.c	…
ast.h	…
astdec.c	…
astenc.c	…
au.c	…
audiointerleave.c	…
audiointerleave.h	…
avc.c	…
avc.h	…
avformat.h	Merge remote-tracking branch 'qatar/master'	2013-09-05 13:34:37 +02:00
avi.h	…
avidec.c	avformat/avidec: match first index and first packet size=0 handling	2013-08-31 03:08:25 +02:00
avienc.c	…
avio.c	…
avio.h	…
avio_internal.h	Merge commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0'	2013-08-08 12:04:46 +02:00
aviobuf.c	Merge commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0'	2013-08-08 12:04:46 +02:00
avisynth.c	avisynth: Support video input from AviSynth 2.5 properly.	2013-08-17 14:27:25 +02:00
avlanguage.c	…
avlanguage.h	…
avr.c	…
avs.c	…
bethsoftvid.c	…
bfi.c	…
bink.c	…
bintext.c	…
bit.c	…
bluray.c	…
bmv.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
boadec.c	…
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	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
cutils.c	…
data_uri.c	…
daud.c	…
dfa.c	…
diracdec.c	…
dnxhddec.c	…
dsicin.c	…
dtsdec.c	…
dtshddec.c	…
dv.c	Merge commit 'fcc455ff2e11ed04603aead1984a92ac3a4be226'	2013-08-06 18:01:03 +02:00
dv.h	…
dvenc.c	…
dxa.c	…
eacdata.c	…
electronicarts.c	Merge commit '163a729725c6eb0081b0af41a7279f7d19aee86e'	2013-08-16 12:25:07 +02:00
epafdec.c	…
ffm.h	…
ffmdec.c	…
ffmenc.c	…
ffmeta.h	…
ffmetadec.c	…
ffmetaenc.c	…
file.c	Merge commit '51eb213d00154b8e7856c7667ea62db8b0f663d4'	2013-08-08 11:47:12 +02:00
file_open.c	libavutil: Make avpriv_open a library-internal function on msvcrt	2013-08-10 00:53:33 +03:00
filmstripdec.c	…
filmstripenc.c	…
flacdec.c	…
flacdec.h	…
flacdec_picture.c	ff_flac_parse_picture: assert that len is within the array	2013-08-07 17:18:05 +02:00
flacenc.c	…
flacenc.h	…
flacenc_header.c	…
flic.c	…
flv.h	…
flvdec.c	Merge commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2'	2013-08-28 12:03:06 +02:00
flvenc.c	…
format.c	…
framecrcenc.c	…
framehash.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
frmdec.c	…
ftp.c	lavf/ftp: fix possible crash	2013-08-29 01:57:38 +02:00
g722.c	…
g723_1.c	…
g729dec.c	…
gif.c	…
gifdec.c	…
gopher.c	…
gsmdec.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
gxf.c	…
gxf.h	…
gxfenc.c	avformat/gxfenc: replace deprecated PIX_FMT constants	2013-07-30 12:29:20 +02:00
h261dec.c	…
h263dec.c	…
h264dec.c	…
h265dec.c	avformat: H265 demuxer	2013-09-03 19:34:04 +02:00
hls.c	Merge remote-tracking branch 'qatar/master'	2013-07-31 11:01:30 +02:00
hlsenc.c	Merge commit '09c93b1b957f2049ea5fd8fb0e6f4d82680172f2'	2013-08-16 14:03:44 +02:00
hlsproto.c	…
http.c	…
http.h	…
httpauth.c	…
httpauth.h	…
icodec.c	…
icoenc.c	…
id3v1.c	…
id3v1.h	…
id3v2.c	…
id3v2.h	…
id3v2enc.c	avformat/id3v2enc: use UTF-16 in id3v2.3 APIC frame only if non-ASCII	2013-08-11 13:06:40 +02:00
idcin.c	…
idroqdec.c	…
idroqenc.c	…
iff.c	…
ilbc.c	…
img2.c	…
img2dec.c	img2dec: fix typo (double "with with")	2013-08-12 18:04:09 +02:00
img2enc.c	lavf/image2: extend start_number range to accept zero	2013-08-22 14:26:23 +02:00
ingenientdec.c	…
internal.h	avformat: move PROBE_BUF_M* to internal.h	2013-08-26 00:54:30 +02:00
ipmovie.c	…
ircam.c	…
ircam.h	…
ircamdec.c	…
ircamenc.c	…
isom.c	…
isom.h	Merge commit '1f70a5ad284b33e8b3e2b40a5cb33055419781b7'	2013-08-23 13:27:34 +02:00
iss.c	…
iv8.c	…
ivfdec.c	…
ivfenc.c	…
jacosubdec.c	…
jacosubenc.c	…
jvdec.c	…
latmenc.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
libavformat.v	…
libgme.c	…
libmodplug.c	…
libnut.c	…
libquvi.c	…
librtmp.c	…
lmlm4.c	…
loasdec.c	…
log2_tab.c	…
lvfdec.c	…
lxfdec.c	avformat/lxfdec: use a parser to parse video frame headers	2013-09-01 00:21:37 +02:00
m4vdec.c	…
matroska.c	avformat/matroskadec: add WebVTT support	2013-08-19 22:34:57 +02:00
matroska.h	avformat/matroskadec: add WebVTT support	2013-08-19 22:34:57 +02:00
matroskadec.c	Merge commit '5bcd3ae5b167fb74215520b01d5d810e0c8986ab'	2013-09-04 12:07:06 +02:00
matroskaenc.c	Merge remote-tracking branch 'qatar/master'	2013-09-05 13:34:37 +02:00
md5enc.c	…
md5proto.c	…
metadata.c	…
metadata.h	…
mgsts.c	…
microdvddec.c	Update copyrights where my email appears with the new one.	2013-09-03 20:42:24 +02:00
microdvdenc.c	…
mkvtimestamp_v2.c	…
mm.c	…
mmf.c	…
mms.c	…
mms.h	…
mmsh.c	…
mmst.c	…
mov.c	Merge commit '5b41eb91e0083755de8c35e8cd005896ec3ab31f'	2013-08-26 14:26:40 +02:00
mov_chan.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
mov_chan.h	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
movenc.c	Merge remote-tracking branch 'qatar/master'	2013-09-03 15:18:57 +02:00
movenc.h	Merge remote-tracking branch 'qatar/master'	2013-08-23 13:49:24 +02:00
movenchint.c	…
mp3dec.c	avformat/mp3dec: improve detection of mp3s with huge id3 tags	2013-08-26 00:57:35 +02:00
mp3enc.c	…
mpc.c	…
mpc8.c	…
mpeg.c	Merge commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9'	2013-09-01 13:00:08 +02:00
mpeg.h	…
mpegenc.c	…
mpegts.c	avformat/mpegts: Ensure that mpegts_get_dts() only considers packets at or after the given position	2013-09-04 01:02:06 +02:00
mpegts.h	…
mpegtsenc.c	mpegtsenc: add option tables_version	2013-08-03 12:44:53 +02:00
mpegvideodec.c	…
mpjpeg.c	…
mpl2dec.c	avformat/mpl2dec: handle files with CRLF linebreaks correctly	2013-09-03 20:38:40 +02:00
mpsubdec.c	…
msnwc_tcp.c	…
mtv.c	…
mux.c	Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'	2013-08-03 10:08:30 +02:00
mvdec.c	…
mvi.c	…
mxf.c	…
mxf.h	…
mxfdec.c	…
mxfenc.c	Merge remote-tracking branch 'qatar/master'	2013-08-05 09:57:28 +02:00
mxg.c	Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'	2013-08-03 10:08:30 +02:00
ncdec.c	…
network.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
network.h	Merge commit '9d5ec50ead97e088d77317e77b18cef06cb3d053'	2013-08-10 10:18:18 +02:00
nistspheredec.c	…
noproxy-test.c	…
nsvdec.c	…
nullenc.c	…
nut.c	avformat/nut: support planar rgb	2013-08-09 23:02:48 +02:00
nut.h	…
nutdec.c	…
nutenc.c	…
nuv.c	…
oggdec.c	ogg: Fix potential infinite discard loop	2013-08-19 05:20:39 +02:00
oggdec.h	…
oggenc.c	…
oggparsecelt.c	…
oggparsedirac.c	…
oggparseflac.c	…
oggparseogm.c	…
oggparseopus.c	…
oggparseskeleton.c	…
oggparsespeex.c	…
oggparsetheora.c	…
oggparsevorbis.c	Merge commit '3562684db716d11de0b0dcc52748e9cd90d68132'	2013-08-14 12:17:02 +02:00
oma.c	…
oma.h	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
omadec.c	Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'	2013-09-03 15:05:18 +02:00
omaenc.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
options.c	Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'	2013-08-03 09:16:36 +02:00
options_table.h	Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'	2013-08-03 09:16:36 +02:00
os_support.c	Merge commit 'dfc6b5c81491abf7effb97b23af17ccf7adcd132'	2013-08-09 07:16:38 +02:00
os_support.h	Merge commit 'dfc6b5c81491abf7effb97b23af17ccf7adcd132'	2013-08-09 07:16:38 +02:00
paf.c	avformat/paf: Fix integer overflow and out of array read	2013-08-09 13:23:10 +02:00
pcm.c	…
pcm.h	…
pcmdec.c	…
pcmenc.c	…
pjsdec.c	…
pmpdec.c	…
psxstr.c	Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'	2013-08-03 10:08:30 +02:00
pva.c	…
pvfdec.c	…
qcp.c	…
qtpalette.h	…
r3d.c	…
rawdec.c	…
rawdec.h	…
rawenc.c	…
rawenc.h	…
rawvideodec.c	…
rdt.c	rdt: make const tables static const	2013-08-05 02:53:16 +02:00
rdt.h	…
realtextdec.c	…
redspark.c	avformat/redspark: check coef_off	2013-08-23 20:05:35 +02:00
riff.c	riff: add 0x64 to g726 works on g726-test1.wav	2013-09-03 08:25:43 -04:00
riff.h	Merge commit '971cce7ebb48a58e72e4dc57b3008e2682bcf4e7'	2013-08-06 16:41:44 +02:00
riffdec.c	Merge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b'	2013-08-06 18:30:47 +02:00
riffenc.c	Merge commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472'	2013-08-06 18:08:30 +02:00
rl2.c	…
rm.c	…
rm.h	…
rmdec.c	Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'	2013-09-03 15:05:18 +02:00
rmenc.c	…
rmsipr.c	…
rmsipr.h	…
rpl.c	…
rsd.c	…
rso.c	…
rso.h	…
rsodec.c	…
rsoenc.c	…
rtmp.h	…
rtmpcrypt.c	…
rtmpcrypt.h	…
rtmpdh.c	…
rtmpdh.h	…
rtmphttp.c	…
rtmppkt.c	Merge remote-tracking branch 'qatar/master'	2013-08-11 11:54:37 +02:00
rtmppkt.h	Merge remote-tracking branch 'qatar/master'	2013-08-11 11:54:37 +02:00
rtmpproto.c	Merge commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa'	2013-08-29 13:43:07 +02:00
rtp.c	rtp: Make ff_rtp_codec_id() case insensitive	2013-08-05 21:53:52 +02:00
rtp.h	Merge commit '2e814d0329aded98c811d0502839618f08642685'	2013-08-01 11:42:30 +02:00
rtpdec.c	…
rtpdec.h	Merge commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5'	2013-08-01 12:03:24 +02:00
rtpdec_amr.c	…
rtpdec_asf.c	…
rtpdec_formats.h	…
rtpdec_g726.c	…
rtpdec_h263.c	…
rtpdec_h263_rfc2190.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
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	…
rtpenc.c	Merge commit '2e814d0329aded98c811d0502839618f08642685'	2013-08-01 11:42:30 +02:00
rtpenc.h	…
rtpenc_aac.c	…
rtpenc_amr.c	…
rtpenc_chain.c	Merge commit '62572435d4106098c090fb8f129a9090e41ff1eb'	2013-08-07 12:05:03 +02:00
rtpenc_chain.h	…
rtpenc_h263.c	…
rtpenc_h263_rfc2190.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
rtpenc_h264.c	…
rtpenc_jpeg.c	…
rtpenc_latm.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
rtpenc_mpv.c	…
rtpenc_vp8.c	…
rtpenc_xiph.c	…
rtpproto.c	Merge commit '4b054a3400f728c54470ee6a1eefe1d82420f6a2'	2013-08-16 12:31:15 +02:00
rtpproto.h	Merge commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5'	2013-08-01 12:03:24 +02:00
rtsp.c	Merge remote-tracking branch 'qatar/master'	2013-08-14 12:42:44 +02:00
rtsp.h	Merge remote-tracking branch 'qatar/master'	2013-08-14 12:42:44 +02:00
rtspcodes.h	…
rtspdec.c	Merge commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5'	2013-08-01 12:03:24 +02:00
rtspenc.c	Merge commit 'f542dedf72091af8e6f32a12bd64289c58857c21'	2013-08-07 11:52:05 +02:00
samidec.c	…
sapdec.c	…
sapenc.c	…
sauce.c	…
sauce.h	…
sbgdec.c	…
sctp.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
sdp.c	…
seek-test.c	…
seek.c	…
seek.h	…
segafilm.c	Merge commit '5268bd2900effa59b51e0fede61aacde5e2f0b95'	2013-08-14 12:25:51 +02:00
segment.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
sierravmd.c	…
siff.c	…
smacker.c	…
smjpeg.c	…
smjpeg.h	…
smjpegdec.c	…
smjpegenc.c	…
smoothstreamingenc.c	Merge commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd'	2013-08-28 12:34:33 +02:00
smush.c	…
sol.c	…
sox.h	…
soxdec.c	…
soxenc.c	…
spdif.c	…
spdif.h	Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'	2013-09-03 15:05:18 +02:00
spdifdec.c	…
spdifenc.c	avformat/spdifenc make const tables static const	2013-08-06 20:30:36 +02:00
srtdec.c	…
srtenc.c	…
srtp.c	…
srtp.h	…
srtpproto.c	…
subtitles.c	vformat/subtitles: check av_copy_packets return code	2013-08-30 21:36:58 +02:00
subtitles.h	…
subviewer1dec.c	…
subviewerdec.c	…
swf.c	…
swf.h	…
swfdec.c	…
swfenc.c	…
takdec.c	avformat/takdec: use init_get_bits8()	2013-08-05 10:14:42 +02:00
tcp.c	avformat/tcp: fix pointer to int warning	2013-08-25 19:44:40 +02:00
tedcaptionsdec.c	avformat/tedcaptionsdec: make const arrays static const	2013-08-10 18:44:40 +02:00
tee.c	lavf/tee: copy metadata to output chained muxers	2013-08-23 12:27:09 +02:00
thp.c	…
tiertexseq.c	…
tls.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
tmv.c	…
tta.c	…
tty.c	…
txd.c	…
udp.c	Merge commit 'bb9378251a167ef0116f263912e57f715c1e02ac'	2013-08-06 15:40:05 +02:00
unix.c	avformat/unix: reshuffle #includes	2013-08-21 05:51:41 +02:00
url-test.c	…
url.c	…
url.h	…
urldecode.c	…
urldecode.h	…
utils.c	avformat: make avformat_close_input() more tolerant.	2013-09-04 22:06:38 +02:00
vc1test.c	…
vc1testenc.c	…
version.h	avformat: make avformat_close_input() more tolerant.	2013-09-04 22:06:38 +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	w64dec: fix end position of summarylist guid	2013-09-03 01:03:10 +00:00
wavenc.c	…
wc3movie.c	…
webvttdec.c	…
webvttenc.c	lavf/webvttenc: use proper printf format for int64_t values	2013-07-30 20:32:26 +00:00
westwood_aud.c	…
westwood_vqa.c	…
wtv.c	…
wtv.h	…
wtvdec.c	…
wtvenc.c	…
wv.c	…
wv.h	…
wvdec.c	…
wvenc.c	…
xa.c	…
xmv.c	…
xwma.c	…
yop.c	…
yuv4mpeg.c	…