Michael Niedermayer 35a8387b40 Merge commit '72fe16a13e3ebd5396ac173bf84c8b20085c16d5' ... * commit '72fe16a13e3ebd5396ac173bf84c8b20085c16d5': movenc: Use null buffers for measuring the amount of data to be written Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-09-20 12:37:24 +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	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
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	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
anm.c	…
apc.c	…
ape.c	Merge commit '183b9d843a9533774fabd3984a52f3987001acbc'	2013-09-12 13:51:20 +02:00
apetag.c	…
apetag.h	…
aqtitledec.c	…
asf.c	Merge commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743'	2013-09-20 11:18:20 +02:00
asf.h	Merge commit '09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9'	2013-09-20 11:43:32 +02:00
asfcrypt.c	…
asfcrypt.h	…
asfdec.c	Merge commit '5f408333601a827054335f309defcb246a532b21'	2013-09-20 10:57:20 +02:00
asfenc.c	Merge commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5'	2013-09-20 12:06:15 +02:00
assdec.c	…
assenc.c	Merge commit '73084391588b0f150737990038829cac5013dd68'	2013-09-17 12:16:55 +02:00
ast.c	…
ast.h	…
astdec.c	…
astenc.c	…
au.c	…
audiointerleave.c	…
audiointerleave.h	…
avc.c	…
avc.h	…
avformat.h	Merge commit '596e5d4783ca951258a7c580951fd161f1785ec1'	2013-09-17 12:01:35 +02:00
avi.h	…
avidec.c	Merge commit '5626f994f273af80fb100d4743b963304de9e05c'	2013-09-19 11:01:26 +02:00
avienc.c	Merge commit '5626f994f273af80fb100d4743b963304de9e05c'	2013-09-19 11:01:26 +02:00
avio.c	…
avio.h	…
avio_internal.h	Merge commit '3627ce2f1dab1d33b7f99d78907a3e4d86b7d847'	2013-09-20 12:26:09 +02:00
aviobuf.c	Merge commit '3627ce2f1dab1d33b7f99d78907a3e4d86b7d847'	2013-09-20 12:26:09 +02:00
avisynth.c	Merge commit '97b052e56807fab6887e9ba210a28a622e6a4b78'	2013-09-06 13:39:15 +02:00
avlanguage.c	…
avlanguage.h	…
avr.c	…
avs.c	…
bethsoftvid.c	…
bfi.c	…
bink.c	…
bintext.c	…
bit.c	…
bluray.c	…
bmv.c	avformat/bmv: remove unused variable	2013-09-19 22:04:34 +02: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	avformat/concat: revert one hunk of 20dfab33f5	2013-09-19 15:18:15 +02:00
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	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
dfa.c	…
diracdec.c	…
dnxhddec.c	…
dsicin.c	Merge commit '48d6556dd46d4f4fac10d0f4a819e314887cd50e'	2013-09-12 11:19:38 +02:00
dtsdec.c	…
dtshddec.c	…
dv.c	Merge commit '7ee191cab0dc44700f26c5784e2adeb6a779651b'	2013-09-08 11:51:36 +02:00
dv.h	…
dvenc.c	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
dxa.c	…
eacdata.c	…
electronicarts.c	…
epafdec.c	…
ffm.h	…
ffmdec.c	…
ffmenc.c	…
ffmeta.h	…
ffmetadec.c	avformat/ffmetadec: return meaningful error codes	2013-09-11 11:06:44 +00:00
ffmetaenc.c	…
file.c	…
file_open.c	…
filmstripdec.c	…
filmstripenc.c	…
flacdec.c	…
flacdec.h	…
flacdec_picture.c	…
flacenc.c	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
flacenc.h	…
flacenc_header.c	…
flic.c	avformat/flic: check for memory allocation failures	2013-09-11 11:06:44 +00:00
flv.h	…
flvdec.c	Merge commit '0a9425d7cfdf0113c3d32096c9406823efe0cd0a'	2013-09-17 11:44:02 +02:00
flvenc.c	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
format.c	…
framecrcenc.c	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
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	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
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	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
h261dec.c	…
h263dec.c	…
h264dec.c	…
h265dec.c	avformat: H265 demuxer	2013-09-03 19:34:04 +02:00
hls.c	…
hlsenc.c	…
hlsproto.c	…
http.c	…
http.h	…
httpauth.c	…
httpauth.h	…
icodec.c	…
icoenc.c	…
id3v1.c	…
id3v1.h	…
id3v2.c	…
id3v2.h	…
id3v2enc.c	…
idcin.c	…
idroqdec.c	Merge commit 'bcbe4f3ceb6ee0210d3a401963518906c8b9b230'	2013-09-19 13:34:25 +02:00
idroqenc.c	…
iff.c	…
ilbc.c	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
img2.c	Add a WebP decoder	2013-09-18 14:10:05 -04:00
img2dec.c	…
img2enc.c	…
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	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
jacosubdec.c	avformat/subtitles: add a next line jumper and use it.	2013-09-08 18:48:09 +02:00
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	avformat/libnut: check avformat_new_stream() return value	2013-09-11 11:06:45 +00:00
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	lavf/matroska: Removing experimental suffix for Opus	2013-09-12 23:55:29 +02:00
matroska.h	lavf/matroska: Adding support for Opus CodecDelay	2013-09-10 01:45:38 +02:00
matroskadec.c	avformat/matroskadec: correct spurious keyframe warnings in webm	2013-09-20 03:45:02 +02:00
matroskaenc.c	matroskaenc: Write muxingapp and writingapp elements when using bitexact flag	2013-09-18 23:06:59 +02:00
md5enc.c	…
md5proto.c	…
metadata.c	…
metadata.h	…
mgsts.c	…
microdvddec.c	avformat/subtitles: add a next line jumper and use it.	2013-09-08 18:48:09 +02:00
microdvdenc.c	…
mkvtimestamp_v2.c	…
mm.c	…
mmf.c	…
mms.c	…
mms.h	…
mmsh.c	…
mmst.c	Merge commit '5626f994f273af80fb100d4743b963304de9e05c'	2013-09-19 11:01:26 +02:00
mov.c	Merge commit '5626f994f273af80fb100d4743b963304de9e05c'	2013-09-19 11:01:26 +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 commit '72fe16a13e3ebd5396ac173bf84c8b20085c16d5'	2013-09-20 12:37:24 +02:00
movenc.h	Merge remote-tracking branch 'qatar/master'	2013-09-18 13:32:55 +02:00
movenchint.c	Merge commit '5626f994f273af80fb100d4743b963304de9e05c'	2013-09-19 11:01:26 +02:00
mp3dec.c	Merge commit 'c0779a67e85df856904ee6fab760c4233d4c2be5'	2013-09-12 15:02:23 +02:00
mp3enc.c	Merge commit 'c0779a67e85df856904ee6fab760c4233d4c2be5'	2013-09-12 15:02:23 +02:00
mpc.c	…
mpc8.c	Merge commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0'	2013-09-12 14:31:07 +02:00
mpeg.c	avformat/vobsub: fix seeking.	2013-09-08 12:54:49 +02:00
mpeg.h	Use 0x88 as stream id when muxing DTS in program streams.	2013-09-10 01:48:59 +02:00
mpegenc.c	…
mpegts.c	Merge commit 'f369b9356c4606cd4d713d60f7db5de119d901fa'	2013-09-11 11:23:40 +02:00
mpegts.h	…
mpegtsenc.c	…
mpegvideodec.c	…
mpjpeg.c	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
mpl2dec.c	avformat/subtitles: add a next line jumper and use it.	2013-09-08 18:48:09 +02:00
mpsubdec.c	avformat/subtitles: add a next line jumper and use it.	2013-09-08 18:48:09 +02:00
msnwc_tcp.c	…
mtv.c	…
mux.c	Merge commit '596e5d4783ca951258a7c580951fd161f1785ec1'	2013-09-17 12:01:35 +02:00
mvdec.c	…
mvi.c	…
mxf.c	…
mxf.h	…
mxfdec.c	avformat/mxfdec: use av_realloc_array()	2013-09-11 13:37:31 +02:00
mxfenc.c	Use rc_max_rate if no video bit_rate was specified when muxing mxf_d10.	2013-09-12 08:58:27 +02:00
mxg.c	…
ncdec.c	…
network.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
network.h	…
nistspheredec.c	…
noproxy-test.c	…
nsvdec.c	…
nullenc.c	…
nut.c	…
nut.h	…
nutdec.c	avformat/nutdec: check for allocation failures	2013-09-11 15:04:08 +00:00
nutenc.c	avformat/nutenc: use av_reallocp_array()	2013-09-14 16:14:43 +00:00
nuv.c	…
oggdec.c	lavf/ogg: Support for end trimming Opus	2013-09-16 21:42:41 +02:00
oggdec.h	lavf/ogg: Support for end trimming Opus	2013-09-16 21:42:41 +02:00
oggenc.c	…
oggparsecelt.c	…
oggparsedirac.c	…
oggparseflac.c	…
oggparseogm.c	Merge commit '19b9659f3174599e8685d329c4330b1ea8c4c6db'	2013-09-17 15:50:21 +02:00
oggparseopus.c	lavf/oggopus: Fixing a log message	2013-09-16 23:46:39 +02:00
oggparseskeleton.c	…
oggparsespeex.c	…
oggparsetheora.c	Merge commit '5626f994f273af80fb100d4743b963304de9e05c'	2013-09-19 11:01:26 +02:00
oggparsevorbis.c	Merge commit '5626f994f273af80fb100d4743b963304de9e05c'	2013-09-19 11:01:26 +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 '342c43d154e586bc022c86b168fe8d36f69da9d3'	2013-09-16 12:15:42 +02:00
omaenc.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
options.c	…
options_table.h	lavf/options_table: improve option help text	2013-09-17 19:47:58 +02:00
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	…
rawdec.h	…
rawenc.c	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
rawenc.h	…
rawvideodec.c	…
rdt.c	Merge commit '5626f994f273af80fb100d4743b963304de9e05c'	2013-09-19 11:01:26 +02:00
rdt.h	…
realtextdec.c	…
redspark.c	…
riff.c	riff: g723_1 decodes vivo g723.1 in asf	2013-09-15 22:03:03 -04:00
riff.h	…
riffdec.c	…
riffenc.c	…
rl2.c	…
rm.c	…
rm.h	…
rmdec.c	Merge commit '0f310a6f333b016d336674d086045e8473fdf918'	2013-09-19 10:38:40 +02:00
rmenc.c	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
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	Merge commit '5626f994f273af80fb100d4743b963304de9e05c'	2013-09-19 11:01:26 +02:00
rtmppkt.c	Merge commit '8583b14252deac71136f1dec231910abab0ba503'	2013-09-18 12:09:06 +02:00
rtmppkt.h	Merge commit '8583b14252deac71136f1dec231910abab0ba503'	2013-09-18 12:09:06 +02:00
rtmpproto.c	rtmp: Unbreak handle_notify	2013-09-19 11:27:21 +02:00
rtp.c	…
rtp.h	…
rtpdec.c	…
rtpdec.h	…
rtpdec_amr.c	…
rtpdec_asf.c	Merge commit '5626f994f273af80fb100d4743b963304de9e05c'	2013-09-19 11:01:26 +02:00
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	Merge commit '5626f994f273af80fb100d4743b963304de9e05c'	2013-09-19 11:01:26 +02:00
rtpdec_svq3.c	…
rtpdec_vp8.c	…
rtpdec_xiph.c	…
rtpenc.c	…
rtpenc.h	…
rtpenc_aac.c	…
rtpenc_amr.c	…
rtpenc_chain.c	…
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	…
rtpproto.h	…
rtsp.c	…
rtsp.h	…
rtspcodes.h	…
rtspdec.c	…
rtspenc.c	…
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	avformat/segafilm: remove deplanarization hack	2013-09-16 13:30:20 +00:00
segment.c	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
sierravmd.c	avformat/sierravmd: use av_freep() for freeing context fields	2013-09-16 14:53:56 +02:00
siff.c	…
smacker.c	avformat/smacker: Check if bufs has been allocated before use	2013-09-19 14:20:21 +02:00
smjpeg.c	…
smjpeg.h	…
smjpegdec.c	…
smjpegenc.c	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
smoothstreamingenc.c	Merge commit '5626f994f273af80fb100d4743b963304de9e05c'	2013-09-19 11:01:26 +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	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
srtdec.c	avformat/subtitles: add a next line jumper and use it.	2013-09-08 18:48:09 +02:00
srtenc.c	…
srtp.c	…
srtp.h	…
srtpproto.c	…
subtitles.c	avformat/subtitles: support standalone CR (MacOS).	2013-09-08 18:48:35 +02:00
subtitles.h	lavf/subtitles: Make comment less arrogant	2013-09-15 22:37:13 +02:00
subviewer1dec.c	…
subviewerdec.c	…
swf.c	…
swf.h	…
swfdec.c	…
swfenc.c	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
takdec.c	…
tcp.c	tcp: Explicitly convert a pointer to a boolean integer	2013-09-09 23:57:04 +03:00
tedcaptionsdec.c	…
tee.c	vformat/tee: fix uninitialized use of ret	2013-09-07 22:43:32 +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	…
unix.c	…
url-test.c	…
url.c	…
url.h	…
urldecode.c	…
urldecode.h	…
utils.c	Merge commit '5626f994f273af80fb100d4743b963304de9e05c'	2013-09-19 11:01:26 +02:00
vc1test.c	…
vc1testenc.c	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
version.h	Merge commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5'	2013-09-20 12:06:15 +02:00
vivo.c	…
voc.c	…
voc.h	…
vocdec.c	Merge commit '5bbfe193a0a41bd2adb648c8c3f6901a575734a2'	2013-09-16 12:38:56 +02:00
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	…
westwood_aud.c	…
westwood_vqa.c	…
wtv.c	…
wtv.h	…
wtvdec.c	…
wtvenc.c	…
wv.c	…
wv.h	…
wvdec.c	…
wvenc.c	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00
xa.c	…
xmv.c	Merge commit 'd4c2a3740fb95f952a87ba320d2bf31f126bdf68'	2013-09-18 11:24:27 +02:00
xwma.c	…
yop.c	…
yuv4mpeg.c	lavf: Don't explicitly flush after each written packet in muxers	2013-09-16 22:17:33 +03:00