1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
FFmpeg/libavformat
Michael Niedermayer 0bdc5db520 Merge commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb'
* commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb':
  movenc: Remove an outdated comment

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08 10:57:10 +01:00
..
4xm.c
a64.c
aacdec.c
ac3dec.c
act.c
adp.c
adtsenc.c
adxdec.c
aea.c
afc.c
aiff.h
aiffdec.c
aiffenc.c
allformats.c avformat/udp: UDP-Lite (RFC 3828) support added 2014-11-05 11:16:05 +01:00
amr.c
anm.c
apc.c
ape.c
apetag.c
apetag.h
aqtitledec.c
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c
asfenc.c
assdec.c assdec: check av_new_packet return value 2014-10-29 16:54:43 +00:00
assenc.c avformat/assenc: Add ignore_gaps option 2014-11-01 19:38:48 +01:00
ast.c
ast.h
astdec.c
astenc.c
au.c
audiointerleave.c Merge commit '1967cd4e4c1cd96dfa195ce14e4b212ddb70586d' 2014-10-25 03:27:13 +02:00
audiointerleave.h
avc.c
avc.h
avformat.h Merge commit '1384df641994bf3d6cb51084290aa94752737bae' 2014-11-07 23:09:30 +01:00
avformatres.rc
avi.h
avidec.c avformat: Add and use ff_copy_whitelists() 2014-10-24 19:23:23 +02:00
avienc.c
avio_internal.h
avio.c avio: fix sizeof argument 2014-10-20 10:38:38 +01:00
avio.h
aviobuf.c Merge commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2' 2014-10-20 21:25:37 +02:00
avisynth.c
avlanguage.c
avlanguage.h
avr.c
avs.c
bethsoftvid.c Merge commit '84bf64d3598c98a748e609195358ea04b0cfd140' 2014-10-29 22:47:11 +01:00
bfi.c
bink.c
bintext.c
bit.c
bluray.c
bmv.c
boadec.c
brstm.c
c93.c
cache.c
caf.c
caf.h
cafdec.c
cafenc.c
cavsvideodec.c
cdg.c
cdxl.c
cinedec.c lavf/cinedec: Fix a typo in the file header. 2014-10-22 01:37:02 +02:00
concat.c
concatdec.c avformat: Add and use ff_copy_whitelists() 2014-10-24 19:23:23 +02:00
crcenc.c
crypto.c
cutils.c Merge commit 'ed6dad3737bf7bb2d5e9fa9511dfdb44806010e8' 2014-10-26 03:22:52 +01:00
data_uri.c
dauddec.c
daudenc.c
dfa.c
diracdec.c
dnxhddec.c
dsfdec.c
dsicin.c
dtsdec.c
dtshddec.c
dump.c
dv.c
dv.h
dvenc.c
dxa.c
eacdata.c
electronicarts.c
epafdec.c
ffm.h
ffmdec.c
ffmenc.c
ffmeta.h
ffmetadec.c
ffmetaenc.c
file_open.c
file.c
filmstripdec.c avformat/filmstripdec: Fix several integer overflows 2014-10-27 22:57:17 +01:00
filmstripenc.c
flac_picture.c Merge commit '0b66fb4505e0bb43de3797f63f3290f0188d67cc' 2014-10-25 04:03:41 +02:00
flac_picture.h
flacdec.c Merge commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c' 2014-11-06 13:42:41 +01:00
flacenc_header.c
flacenc.c
flacenc.h
flic.c
flv.h
flvdec.c Merge commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae' 2014-10-21 22:35:30 +02:00
flvenc.c avformat/flvenc: Use AVFormatContext strict_std_compliance instead of AVCodecContext 2014-11-06 14:47:43 +01:00
format.c avformat/format: Use av_match_name() instead of list in av_match_ext() 2014-10-23 04:33:09 +02:00
framecrcenc.c
framehash.c
frmdec.c
ftp.c
g722.c
g723_1.c
g729dec.c
gif.c
gifdec.c
golomb_tab.c
gopher.c
gsmdec.c
gxf.c
gxf.h
gxfenc.c
h261dec.c
h263dec.c
h264dec.c
hdsenc.c avformat/hdsenc: Read errno before av_log() as the callback from av_log() might affect errno 2014-10-25 13:28:51 +02:00
hevc.c
hevc.h
hevcdec.c
hls.c avformat: Add and use ff_copy_whitelists() 2014-10-24 19:23:23 +02:00
hlsenc.c hlsenc.c, segment.c: propagate defaults to mpegts 2014-10-17 21:31:25 +02:00
hlsproto.c Merge commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea' 2014-10-24 12:40:36 +02:00
hnm.c
http.c avformat/http: pass return code from http_open_cnx_internal() on its failure 2014-10-23 20:58:21 +02:00
http.h avformat/http: Introduce ff_http_averror() 2014-10-20 04:31:46 +02:00
httpauth.c
httpauth.h
icecast.c
icodec.c
icoenc.c
id3v1.c
id3v1.h
id3v2.c id3v2: prefer TDRC for date over TDRL. 2014-11-04 14:11:53 +01:00
id3v2.h
id3v2enc.c
idcin.c idcin: fix return check 2014-10-20 10:38:37 +01:00
idroqdec.c
idroqenc.c
iff.c
ilbc.c
img2_alias_pix.c
img2_brender_pix.c
img2.c
img2.h
img2dec.c Merge commit 'f1ed83e23add1c26c50b146727e4c2399dfc0b3a' 2014-10-25 03:37:21 +02:00
img2enc.c avformat/img2enc: Use localtime_r() for thread saftey 2014-11-02 20:09:16 +01:00
ingenientdec.c
internal.h avformat: Print error message on failure of ff_rename() 2014-10-25 13:28:51 +02:00
ipmovie.c
ircam.c
ircam.h
ircamdec.c
ircamenc.c
isom.c
isom.h avformat/mov: auodetect "use_mfra_for" 2014-10-15 20:17:23 +02:00
iss.c
iv8.c
ivfdec.c
ivfenc.c
jacosubdec.c
jacosubenc.c
jvdec.c
latmenc.c
libavformat.v
libgme.c
libmodplug.c
libnut.c
libquvi.c avformat: Add and use ff_copy_whitelists() 2014-10-24 19:23:23 +02:00
librtmp.c
libsmbclient.c avformat: Read errno before av_log() as the callback from av_log() might affect errno 2014-10-25 13:48:56 +02:00
libssh.c
lmlm4.c
loasdec.c
log2_tab.c
lrc.c
lrc.h
lrcdec.c
lrcenc.c
lvfdec.c
lxfdec.c
m4vdec.c avformat/m4vdec: mark as possibly containing discontinuities 2014-10-17 12:51:49 +02:00
Makefile avformat: add webp muxer 2014-11-01 20:10:52 +01:00
matroska.c
matroska.h
matroskadec.c Fix read-after-free in matroska_read_seek(). 2014-11-08 01:33:13 +01:00
matroskaenc.c Merge commit '090c67d586e3916f9acc49e010b6389d07f97153' 2014-10-27 22:18:03 +01:00
md5enc.c
md5proto.c
metadata.c
metadata.h
mgsts.c
microdvddec.c
microdvdenc.c
mkvtimestamp_v2.c
mlvdec.c avformat/mlvdec: Check the return code from strftime() 2014-10-26 17:07:29 +01:00
mm.c
mmf.c avformat/mmf: Use AVFormatContext strict_std_compliance instead of AVCodecContext 2014-11-06 14:48:41 +01:00
mms.c
mms.h
mmsh.c
mmst.c
mov_chan.c
mov_chan.h
mov.c Merge commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de' 2014-10-26 02:38:26 +01:00
movenc.c Merge commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb' 2014-11-08 10:57:10 +01:00
movenc.h Merge commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8' 2014-11-08 00:22:42 +01:00
movenchint.c
mp3dec.c avformat/mp3dec: also accept Lavc as shortname to read delays 2014-10-24 18:06:26 +02:00
mp3enc.c id3v2: prefer TDRC for date over TDRL. 2014-11-04 14:11:53 +01:00
mpc8.c
mpc.c
mpeg.c avformat/mpeg: Use av_find_input_format() instead of directly linking to the demuxer 2014-10-25 16:28:41 +02:00
mpeg.h
mpegenc.c
mpegts.c avformat/mpegts: fix iteration count in add_pid_to_pmt() 2014-11-04 19:31:59 +01:00
mpegts.h
mpegtsenc.c
mpegvideodec.c
mpjpeg.c avformat/mpjpeg: make boundary tag user customizable 2014-10-29 18:31:32 +01:00
mpl2dec.c
mpsubdec.c
msnwc_tcp.c
mtv.c Merge commit 'f64d7e919eabd427f3e6dd4a1219e448c78deb42' 2014-10-29 21:27:33 +01:00
mux.c Merge commit '897d5c3a4296f3da80b8699d1487328ca2de8e55' 2014-11-07 23:22:10 +01:00
mvdec.c avformat/mvdec: Check size in read_table() for validity 2014-10-28 17:51:14 +01:00
mvi.c
mxf.c
mxf.h libavformat/mxfdec: read source timecode from pulldown component 2014-10-25 23:15:04 +02:00
mxfdec.c avformat/mxfdec: fix null pointer dereference 2014-10-29 03:54:49 +01:00
mxfenc.c mxfenc: fix indentation after last commit 2014-10-29 23:49:13 +01: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: do not set has_b_frames 2014-11-06 09:05:37 +01:00
nutenc.c Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba' 2014-10-22 00:09:00 +02:00
nuv.c
oggdec.c
oggdec.h
oggenc.c Merge commit 'e839de0f851535b5e19256b52f9865f0cb768a7c' 2014-11-06 14:09:53 +01:00
oggparsecelt.c
oggparsedirac.c avformat/oggparsedirac: use AVCodecContext.framerate 2014-10-16 01:31:09 +02:00
oggparseflac.c Merge commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c' 2014-11-06 13:42:41 +01:00
oggparseogm.c
oggparseopus.c
oggparseskeleton.c
oggparsespeex.c
oggparsetheora.c
oggparsevorbis.c avformat/oggparsevorbis: Check that initialization succeeded before declaring the end of headers 2014-11-06 13:02:08 +01:00
oggparsevp8.c
oma.c
oma.h
omadec.c
omaenc.c
options_table.h Merge commit '1384df641994bf3d6cb51084290aa94752737bae' 2014-11-07 23:09:30 +01:00
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 Merge commit '2d6e58497e76836604364b037df9b00ba3d75b69' 2014-10-15 18:19:58 +02:00
rawdec.h
rawenc.c
rawenc.h
rawvideodec.c
rdt.c avformat/rdt: Forward whitelists to rdt demuxer 2014-10-25 21:17:27 +02:00
rdt.h
realtextdec.c Print a warning if a subtitle demuxer changes utf16 to utf8. 2014-10-29 01:32:44 +01:00
redspark.c
replaygain.c
replaygain.h
riff.c Added support for G2M5 codec 2014-10-24 19:36:09 +02:00
riff.h
riffdec.c
riffenc.c avformat/riffenc: move MP3 LSF threshold to the midway point between the 2 2014-11-06 14:53:21 +01:00
rl2.c
rm.c
rm.h
rmdec.c Merge commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709' 2014-10-21 23:47:44 +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
rtmppkt.h
rtmpproto.c Merge commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404' 2014-11-05 10:17:07 +01:00
rtp.c
rtp.h
rtpdec_amr.c
rtpdec_asf.c avformat/rtpdec_asf: Use av_find_input_format() instead of directly linking to the demuxer 2014-10-25 16:28:03 +02:00
rtpdec_formats.h
rtpdec_g726.c
rtpdec_h261.c avformat/rtpdec_h261: code aligned to the HEVC code 2014-11-01 16:33:52 +01:00
rtpdec_h263_rfc2190.c
rtpdec_h263.c
rtpdec_h264.c
rtpdec_hevc.c Merge commit '350ed1829268d343b791208c8fd1cddd44d52a8e' 2014-10-20 22:25:14 +02:00
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 Merge commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea' 2014-10-24 12:40:36 +02:00
rtpdec.h
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c
rtpenc_chain.h
rtpenc_h261.c
rtpenc_h263_rfc2190.c
rtpenc_h263.c
rtpenc_h264.c
rtpenc_hevc.c
rtpenc_jpeg.c
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c
rtpenc.h
rtpproto.c Merge commit 'd2771a1dc0a3695e8873adc16d068077f2417eea' 2014-10-20 23:05:06 +02:00
rtpproto.h
rtsp.c Merge commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea' 2014-10-24 12:40:36 +02:00
rtsp.h
rtspcodes.h avformat/rtspcodes: introduce ff_rtsp_averror() 2014-10-21 03:51:14 +02:00
rtspdec.c Merge commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea' 2014-10-24 12:40:36 +02:00
rtspenc.c avformat/rtsp: Use ff_rtsp_averror() 2014-10-21 03:52:27 +02:00
samidec.c Print a warning if a subtitle demuxer changes utf16 to utf8. 2014-10-29 01:32:44 +01:00
sapdec.c avformat: Add and use ff_copy_whitelists() 2014-10-24 19:23:23 +02:00
sapenc.c lavf: Use av_gettime_relative 2014-10-24 09:53:45 +03:00
sauce.c
sauce.h
sbgdec.c avformat/sbgdec: Use localtime_r() for thread saftey 2014-11-02 20:08:59 +01:00
sctp.c
sdp.c Merge commit 'e5cfc8fdad901c9487fe896421972852f38bcf5' 2014-10-15 19:16:55 +02:00
sdr2.c
seek-test.c
seek.c
seek.h
segafilm.c
segment.c avformat/segment: use time_internal.h, simplify code 2014-11-02 20:07:34 +01:00
sierravmd.c
siff.c
smacker.c
smjpeg.c
smjpeg.h
smjpegdec.c
smjpegenc.c
smoothstreamingenc.c avformat: Read errno before av_log() as the callback from av_log() might affect errno 2014-10-25 13:48:56 +02:00
smush.c
sol.c
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c
spdifenc.c
srtdec.c Print a warning if a subtitle demuxer changes utf16 to utf8. 2014-10-29 01:32:44 +01:00
srtenc.c
srtp.c
srtp.h
srtpproto.c
stldec.c Added STL demuxer and decoder 2014-10-22 23:12:38 +02:00
subfile.c
subtitles.c avformat/subtitles: reduce log level of UTF-16 warning 2014-10-29 18:29:43 +01:00
subtitles.h Print a warning if a subtitle demuxer changes utf16 to utf8. 2014-10-29 01:32:44 +01:00
subviewer1dec.c
subviewerdec.c
supdec.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 avformat/udp: UDP-Lite (RFC 3828) support added 2014-11-05 11:16:05 +01:00
uncodedframecrcenc.c
unix.c
url-test.c
url.c
url.h Merge commit 'fb238f8230c1b0314985482207add548c68f83cf' 2014-10-18 12:16:04 +02:00
urldecode.c
urldecode.h
utils.c avformat/utils: Leave skip_clear enabled until after estimate_timings() 2014-11-03 22:53:48 +01:00
vc1test.c
vc1testenc.c
version.h Merge commit '9cbf70fa0e44613590b019cef1fe99aa3f3c5d9d' 2014-11-08 01:04:04 +01: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
wavenc.c avformat/wavenc: Use localtime_r() for thread saftey 2014-11-02 20:08:12 +01:00
wc3movie.c
webmdashenc.c
webpenc.c avformat/webpenc: preserve single image VP8X flags 2014-11-07 04:15:01 +01:00
webvttdec.c
webvttenc.c
westwood_aud.c
westwood_vqa.c
wtv_common.c
wtv.h
wtvdec.c Merge commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de' 2014-10-26 02:38:26 +01:00
wtvenc.c
wv.c
wv.h
wvdec.c
wvenc.c
xa.c
xmv.c
xwma.c
yop.c
yuv4mpeg.h
yuv4mpegdec.c
yuv4mpegenc.c avformat/yuv4mpegenc: Use AVFormatContext strict_std_compliance instead of AVCodecContext 2014-11-06 14:48:50 +01:00