FFmpeg/libavformat
Michael Niedermayer 50697ac5b2 Merge commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6'
* commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6':
  wtv: Avoid needlessly calling gmtime twice with the same argument

Conflicts:
	libavformat/wtvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-26 02:21:42 +02:00
..
4xm.c
a64.c
aacdec.c
ac3dec.c
act.c
adp.c
adtsenc.c avformat/adtsenc: buf isnt changed in adts_decode_extradata(), make it const 2014-09-22 18:47:14 +02:00
adxdec.c
aea.c
afc.c
aiff.h
aiffdec.c
aiffenc.c
allformats.c Added STL demuxer and decoder 2014-10-22 23:12:38 +02:00
amr.c
anm.c
apc.c
ape.c
apetag.c Merge commit 'c5560e72d0bb69f8a1ac9536570398f84388f396' 2014-09-17 20:42:26 +02:00
apetag.h
aqtitledec.c
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c
asfenc.c avformat/asfenc: Make asf_write_indexs index argument const 2014-09-22 18:53:44 +02:00
assdec.c avformat/assdec: typo fix 2014-10-15 19:25:06 +02:00
assenc.c avformat/assenc: support remuxing old V4 ASS form (SSA) 2014-10-15 19:24:40 +02: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 Merge commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95' 2014-09-25 00:09:42 +02:00
avc.h Merge commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95' 2014-09-25 00:09:42 +02:00
avformat.h avformat: Add format_whitelist 2014-10-19 04:37:30 +02:00
avformatres.rc
avi.h
avidec.c avformat: Add and use ff_copy_whitelists() 2014-10-24 19:23:23 +02:00
avienc.c libavformat/avienc: Make unchanged function arguments const 2014-09-24 18:34:21 +02:00
avio_internal.h
avio.c avio: fix sizeof argument 2014-10-20 10:38:38 +01:00
avio.h avformat/aviobuf: fix avio_flush() for read streams 2014-09-30 21:31:08 +02:00
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
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 Merge commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2' 2014-09-26 12:24:00 +02:00
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 Merge commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b' 2014-09-25 13:45:30 +02:00
concatdec.c avformat: Add and use ff_copy_whitelists() 2014-10-24 19:23:23 +02:00
crcenc.c
crypto.c
cutils.c
data_uri.c
dauddec.c
daudenc.c
dfa.c avformat/dfa: use avio_feof() 2014-08-30 15:50:22 +00:00
diracdec.c
dnxhddec.c
dsfdec.c
dsicin.c
dtsdec.c
dtshddec.c
dump.c avformat/dump: use format dump_separator if the codec one is not set 2014-10-09 05:41:42 +02:00
dv.c libavformat/dv: Make unchanged function arguments const 2014-09-24 19:11:05 +02:00
dv.h
dvenc.c
dxa.c
eacdata.c
electronicarts.c
epafdec.c
ffm.h
ffmdec.c lavf/ffmdec: return proper error code in ffm2_read_header() 2014-09-05 11:20:07 +02:00
ffmenc.c
ffmeta.h
ffmetadec.c libavformat/ffmetadec: Make unchanged function arguments const 2014-09-24 19:17:55 +02:00
ffmetaenc.c
file_open.c
file.c
filmstripdec.c
filmstripenc.c
flac_picture.c Merge commit '0b66fb4505e0bb43de3797f63f3290f0188d67cc' 2014-10-25 04:03:41 +02:00
flac_picture.h
flacdec.c
flacenc_header.c
flacenc.c avformat/flacenc: use av_clip() instead of av_clip_c() 2014-09-16 16:57:20 +02:00
flacenc.h
flic.c
flv.h
flvdec.c Merge commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae' 2014-10-21 22:35:30 +02:00
flvenc.c avformat/flvenc: fix codec_id_text check 2014-10-02 03:58:54 +02: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 libavformat/ftp: Do not leak memory in routine ftp_features 2014-08-26 00:52:29 +02:00
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 Merge commit '76c70e33d2244a688832f03b53862eb5d9ad3b01' 2014-10-13 01:27:25 +02:00
icodec.c
icoenc.c avformat/icoenc: Remove deprecated use of codec_name 2014-08-28 14:34:55 +02:00
id3v1.c
id3v1.h
id3v2.c avformat/id3v2: support buggy id3v2.3 tag length in id3v2.4 2014-10-17 16:05:53 +02: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 libavformat/iff: print error message when DSDIFF compression type is not supported 2014-09-26 12:51:40 +02:00
ilbc.c
img2_alias_pix.c avformat/img2_alias_pix: Add AVClass and image2 AVOptions 2014-09-11 15:34:13 +02:00
img2_brender_pix.c avformat/img2_alias & brender_pix: fix function names 2014-09-11 15:16:24 +02:00
img2.c avformat/img2: remove useless 'pix' duplicated entry. 2014-09-22 10:25:31 +02:00
img2.h avformat/img2: Make AVOptions available to img* demuxers defined in other files 2014-09-11 15:10:15 +02:00
img2dec.c Merge commit 'f1ed83e23add1c26c50b146727e4c2399dfc0b3a' 2014-10-25 03:37:21 +02:00
img2enc.c
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 avformat/movenc: add EAC3 muxing support. 2014-10-10 19:07:08 +02:00
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 Add missing "const" all over the place. 2014-08-29 18:57:25 +02:00
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 Merge commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5' 2014-09-25 13:51:43 +02:00
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 Added STL demuxer and decoder 2014-10-22 23:12:38 +02:00
matroska.c Kill timed SRT 2014-09-30 20:21:14 +02:00
matroska.h avformat: drop redundant MATROSKA_VIDEO_STEREO_MODE_COUNT identifier 2014-08-29 01:26:52 +02:00
matroskadec.c Merge commit 'e0caa1eb4e518111a81801db0d2ccdd2733ba94b' 2014-10-25 04:37:27 +02:00
matroskaenc.c Merge commit '28c020d4df9b060a58a124a7a5406d4313fbe249' 2014-10-25 04:45:23 +02:00
md5enc.c
md5proto.c
metadata.c
metadata.h
mgsts.c
microdvddec.c
microdvdenc.c
mkvtimestamp_v2.c
mlvdec.c
mm.c
mmf.c
mms.c
mms.h
mmsh.c
mmst.c
mov_chan.c Add missing "const" all over the place. 2014-08-29 18:57:25 +02:00
mov_chan.h
mov.c Merge commit '50dbe6b3544fa64d5611e16553bf542fd71276b8' 2014-10-25 04:57:48 +02:00
movenc.c Merge commit 'c2c22c75cf89e2faab34d1ee1d392cfb065439ea' 2014-10-14 22:03:51 +02:00
movenc.h avformat/movenc: add EAC3 muxing support. 2014-10-10 19:07:08 +02: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 avformat/mp3enc: Squeeze our mp3 encoder tag into the 9byte shortname instead of randomly truncating 2014-10-24 16:15:25 +02: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 Merge commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9' 2014-08-26 14:05:07 +02:00
mpegenc.c mpegenc: limit the maximum muxrate 2014-08-27 06:21:54 +00:00
mpegts.c mpegts: add the judgement if a new program is created successfully 2014-10-16 04:21:21 +02:00
mpegts.h
mpegtsenc.c Merge commit '28816050e47b6dba430a52e429d21a864cffda8e' 2014-10-07 02:51:08 +02:00
mpegvideodec.c
mpjpeg.c
mpl2dec.c
mpsubdec.c
msnwc_tcp.c
mtv.c
mux.c avformat/mux: Fix assertion failure due to max_interleave_delta and poor input 2014-10-22 16:28:49 +02:00
mvdec.c
mvi.c
mxf.c
mxf.h libavformat/mxfdec: read source timecode from pulldown component 2014-10-25 23:15:04 +02:00
mxfdec.c libavformat/mxfdec: read source timecode from pulldown component 2014-10-25 23:15:04 +02:00
mxfenc.c mxfenc: Fix possible integer overflows 2014-10-24 23:48:57 +01:00
mxg.c
ncdec.c
network.c
network.h avformat/network: move sockaddr_union after sockaddr_storage compatibility code 2014-09-16 01:19:53 +02:00
nistspheredec.c
noproxy-test.c
nsvdec.c avformat/nsvdec: fix out-commented asserts so the function names exist 2014-08-26 15:21:25 +02:00
nullenc.c
nut.c
nut.h
nutdec.c Merge commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe' 2014-10-22 00:26:37 +02:00
nutenc.c Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba' 2014-10-22 00:09:00 +02:00
nuv.c
oggdec.c oggdec: fix invalid free on error 2014-08-30 16:38:14 +02:00
oggdec.h
oggenc.c Merge commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0' 2014-10-14 03:00:17 +02:00
oggparsecelt.c
oggparsedirac.c avformat/oggparsedirac: use AVCodecContext.framerate 2014-10-16 01:31:09 +02:00
oggparseflac.c
oggparseogm.c
oggparseopus.c
oggparseskeleton.c
oggparsespeex.c
oggparsetheora.c
oggparsevorbis.c
oggparsevp8.c
oma.c
oma.h
omadec.c
omaenc.c
options_table.h avformat: Add format_whitelist 2014-10-19 04:37:30 +02:00
options.c
os_support.c avformat/os_support: Add _DEFAULT_SOURCE to hide warning about _SVID_SOURCE depreciation 2014-09-19 22:32:05 +02:00
os_support.h avformat/os_support: include unistd.h before defining lseek to lseek64 on android 2014-10-10 02:32:32 +02:00
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 avformat/realtextdec: UTF-16 support 2014-09-05 23:13:07 +02: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: Filter out "BottomUp" in ff_put_bmp_header() 2014-09-23 18:24:40 +02: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 rtmpproto: remove dead code 2014-10-20 10:44:22 +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 Merge commit 'c463dfc7e49929a9891884312b23b27d14729c51' 2014-09-24 17:25:34 +02:00
rtpdec_g726.c
rtpdec_h261.c avformat/rtpdec_h261: Fix sanity checks 2014-08-26 20:37:58 +02: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 avformat/rtpdec_qt: Fix 'warning: passing argument 2 of ffio_init_context discards const qualifier from pointer target type' 2014-09-08 16:56:19 +02:00
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 Merge commit '2bb2c2bd75e5f4b28a945511cda77e0a1a44c758' 2014-09-18 02:14:53 +02:00
rtpenc_chain.h
rtpenc_h261.c
rtpenc_h263_rfc2190.c rtpenc_h263_rfc2190: avoid misleading error output 2014-09-22 03:45:34 +02:00
rtpenc_h263.c
rtpenc_h264.c Merge commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95' 2014-09-25 00:09:42 +02:00
rtpenc_hevc.c Merge commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc' 2014-09-25 00:17:36 +02:00
rtpenc_jpeg.c
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c Merge commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc' 2014-09-25 00:17:36 +02:00
rtpenc.h rtpenc: HEVC/H.265 support 2014-09-24 23:33:26 +03:00
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 Merge commit '8b2e9636c57b22582143467a8a06b509b47b92f9' 2014-10-10 21:18:41 +02:00
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 avformat/samidec: UTF-16 support 2014-09-05 23:13:07 +02: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
sctp.c Merge commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d' 2014-10-10 20:51:52 +02:00
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 hlsenc.c, segment.c: propagate defaults to mpegts 2014-10-17 21:31:25 +02: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 avformat/soxenc: return more meaningful error code 2014-08-28 15:52:25 +00:00
spdif.c
spdif.h
spdifdec.c
spdifenc.c
srtdec.c avformat/srtdec: simpler and more lenient probing 2014-09-26 11:12:41 +02:00
srtenc.c Kill timed SRT 2014-09-30 20:21:14 +02:00
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/realtextdec: UTF-16 support 2014-09-05 23:13:07 +02:00
subtitles.h avformat/realtextdec: UTF-16 support 2014-09-05 23:13:07 +02:00
subviewer1dec.c
subviewerdec.c
supdec.c avformat: add SUP/PGS subtitle demuxer 2014-09-26 10:35:14 +02:00
swf.c
swf.h
swfdec.c avformat/swfdec: Do not change the pixel format 2014-09-07 00:39:52 +02:00
swfenc.c
takdec.c
tcp.c Merge commit '1d4579e38ecad578c86516fad2837a273d11b320' 2014-10-11 00:39:01 +02:00
tedcaptionsdec.c
tee.c
thp.c
tiertexseq.c avformat/tiertexseq: use av_freep(), do not leave stale pointers in memory 2014-10-07 13:46:29 +02:00
tls.c Merge commit 'cd9d6399fd00f5aeacaa90cdc0b74c3570024119' 2014-10-10 22:28:49 +02:00
tmv.c
tta.c
tty.c
txd.c
udp.c avformat/udp: Move variables used only with HAVE_PTHREAD_CANCEL, under the #if 2014-08-30 12:43:58 +02: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: Add and use ff_copy_whitelists() 2014-10-24 19:23:23 +02:00
vc1test.c
vc1testenc.c
version.h Added STL demuxer and decoder 2014-10-22 23:12: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
wavenc.c
wc3movie.c
webmdashenc.c lavf/webm_dash: some fields should go into Representation 2014-10-02 19:20:05 +02:00
webvttdec.c
webvttenc.c
westwood_aud.c
westwood_vqa.c
wtv_common.c
wtv.h
wtvdec.c Merge commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6' 2014-10-26 02:21:42 +02: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