ffmpeg/libavformat
Michael Niedermayer 491c52d3b0 Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc'
* commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc':
  Add Icecast protocol

Conflicts:
	Changelog
	configure
	doc/protocols.texi
	libavformat/icecast.c
	libavformat/version.h

See: e3dc2c86fc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 14:14:13 +02:00
..
4xm.c
Makefile libavformat: Add Icecast protocol 2014-08-04 13:33:44 +02:00
a64.c
aacdec.c Merge commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd' 2014-07-29 21:12:07 +02:00
ac3dec.c
act.c
adp.c
adtsenc.c avformat/adtsenc: Optionally enable ID3 in ADTS. 2014-07-22 02:11:25 +02:00
adxdec.c Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6' 2014-07-09 22:38:13 +02:00
aea.c
afc.c
aiff.h
aiffdec.c
aiffenc.c
allformats.c libavformat: Add Icecast protocol 2014-08-04 13:33:44 +02: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 avformat/asfdec: Try to improve skip case 2014-07-14 01:16:08 +02:00
asfenc.c
assdec.c
assenc.c
ast.c
ast.h
astdec.c
astenc.c
au.c
audiointerleave.c Merge commit '324ff59444ff5470bb325ff1e2be7c4b054fc944' 2014-07-17 14:20:10 +02:00
audiointerleave.h
avc.c
avc.h
avformat.h Add int64_t probesize2 instead of int probesize to AVFormatContext. 2014-07-30 11:09:25 +02:00
avformatres.rc
avi.h
avidec.c
avienc.c
avio.c Merge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15' 2014-07-27 02:09:41 +02:00
avio.h lavf/avio: do not include bprint.h. 2014-07-25 05:37:45 +02:00
avio_internal.h Add int64_t probesize2 instead of int probesize to AVFormatContext. 2014-07-30 11:09:25 +02:00
aviobuf.c Add int64_t probesize2 instead of int probesize to AVFormatContext. 2014-07-30 11:09:25 +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 caf: Use correct printf conversion specifiers for POSIX int types 2014-07-28 13:19:05 -07:00
cafenc.c
cavsvideodec.c
cdg.c avformat/cdg: Do not fail if filesize cannot be determined 2014-07-11 01:04:04 +02:00
cdxl.c
cinedec.c
concat.c
concatdec.c
crcenc.c
crypto.c
cutils.c
data_uri.c
dauddec.c Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1' 2014-07-03 21:42:16 +02:00
daudenc.c Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1' 2014-07-03 21:42:16 +02:00
dfa.c
diracdec.c
dnxhddec.c
dsfdec.c
dsicin.c
dtsdec.c avformat/dtsdec: skip the first 4k in dts_probe() 2014-08-02 17:25:04 +02:00
dtshddec.c
dump.c Merge commit '59ca29a560ba0cfe97457de8cedf77db434f0de4' 2014-07-29 00:41:00 +02:00
dv.c avformat/dv: implement fallback in dv_extract_pack() 2014-07-17 15:29:27 +02:00
dv.h
dvenc.c avformat/dvenc: Implement 32khz & 44.1khz for 25/50fps 2014-07-19 20:48:22 +02:00
dxa.c
eacdata.c
electronicarts.c
epafdec.c
ffm.h
ffmdec.c
ffmenc.c
ffmeta.h
ffmetadec.c
ffmetaenc.c
file.c
file_open.c
filmstripdec.c
filmstripenc.c
flac_picture.c
flac_picture.h
flacdec.c
flacenc.c
flacenc.h
flacenc_header.c
flic.c
flv.h
flvdec.c Merge commit 'fa14804c83a7108a50c63d1f2180e30c75909529' 2014-08-01 21:34:31 +02:00
flvenc.c
format.c avformat/format: Check for av_guess_format() failure 2014-08-02 04:16:02 +02:00
framecrcenc.c
framehash.c
frmdec.c
ftp.c lavf/ftp: always treat all response codes >= 500 as error 2014-07-04 01:21:08 +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/mux: support re-interleaving packets in ff_write_chained() 2014-07-24 22:39:22 +02:00
hevc.c
hevc.h
hevcdec.c
hls.c
hlsenc.c avformat/hlsenc: add some empty lines to make the code easier to read 2014-07-31 00:33:49 +02:00
hlsproto.c
hnm.c
http.c Merge commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc' 2014-08-04 03:44:11 +02:00
http.h Merge commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532' 2014-07-22 22:02:48 +02:00
httpauth.c
httpauth.h
icecast.c Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc' 2014-08-04 14:14:13 +02:00
icodec.c
icoenc.c
id3v1.c
id3v1.h
id3v2.c
id3v2.h
id3v2enc.c Merge commit '9279826008b80daad7446950a821f32033ccd33f' 2014-07-04 00:50:40 +02:00
idcin.c
idroqdec.c
idroqenc.c
iff.c
ilbc.c
img2.c
img2.h
img2_alias_pix.c
img2_brender_pix.c
img2dec.c Autodetect big-endian tiff files. 2014-07-22 18:09:14 +02:00
img2enc.c
ingenientdec.c
internal.h avformat/mux: support re-interleaving packets in ff_write_chained() 2014-07-24 22:39:22 +02:00
ipmovie.c
ircam.c
ircam.h
ircamdec.c
ircamenc.c
isom.c
isom.h Merge commit '20f95f21f9b9595608ba668a6eca78f2d508be67' 2014-07-01 16:31:57 +02:00
iss.c
iv8.c
ivfdec.c
ivfenc.c ivfenc: support VP9 2014-07-03 15:46:26 +02:00
jacosubdec.c
jacosubenc.c
jvdec.c
latmenc.c
libavformat.v
libgme.c
libmodplug.c
libnut.c
libquvi.c
librtmp.c Merge commit '865461099e062de5a3a109c2a5be98004c11d8bd' 2014-07-06 19:12:52 +02:00
libsmbclient.c lavf: add samba protocol via libsmbclient 2014-07-13 20:38:55 +02:00
libssh.c lavf/libssh: set freed pointers to NULL 2014-07-12 03:01:38 +02:00
lmlm4.c
loasdec.c
log2_tab.c
lrc.c AVFormat: LRC demuxer and muxer 2014-07-13 19:18:31 +02:00
lrc.h AVFormat: LRC demuxer and muxer 2014-07-13 19:18:31 +02:00
lrcdec.c AVFormat: LRC demuxer and muxer 2014-07-13 19:18:31 +02:00
lrcenc.c AVFormat: LRC demuxer and muxer 2014-07-13 19:18:31 +02:00
lvfdec.c
lxfdec.c
m4vdec.c avformat/m4vdec: raise threshold slightly for detection 2014-07-09 17:02:34 +02:00
matroska.c
matroska.h lavf/matroska: Add functions for WebM DASH Manifest 2014-07-15 23:56:17 +02:00
matroskadec.c Merge commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a' 2014-07-29 21:18:11 +02:00
matroskaenc.c avformat/matroskaenc: print a warning when the relative timestamp wouldnt fit in 16bit 2014-07-24 20:25:29 +02:00
md5enc.c avformat/md5enc: add format_version, to allow selecting which version to use 2014-07-16 22:50:24 +02:00
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.c movdec: remove nonsensical snprintf. 2014-07-30 20:25:29 +02:00
mov_chan.c
mov_chan.h
movenc.c avformat/movenc: add m4b to list of ipod playable files 2014-07-30 04:19:58 +02:00
movenc.h avformat/movenc: dont mark multichannel as mono tracks as containing the center channel 2014-07-14 17:11:11 +02:00
movenchint.c avformat/mux: support re-interleaving packets in ff_write_chained() 2014-07-24 22:39:22 +02:00
mp3dec.c Ignore xing number of frames if the file is larger than indicated. 2014-07-24 15:34:36 +02:00
mp3enc.c
mpc.c
mpc8.c
mpeg.c
mpeg.h
mpegenc.c
mpegts.c Add int64_t probesize2 instead of int probesize to AVFormatContext. 2014-07-30 11:09:25 +02:00
mpegts.h
mpegtsenc.c avformat/mpegtsenc: do not flush after everything 2014-08-03 18:10:04 +02:00
mpegvideodec.c
mpjpeg.c
mpl2dec.c
mpsubdec.c
msnwc_tcp.c
mtv.c Merge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb' 2014-07-09 23:11:09 +02:00
mux.c avformat/mux: flush after header writing, like after packets 2014-08-03 18:10:04 +02:00
mvdec.c
mvi.c
mxf.c
mxf.h
mxfdec.c mxfdec: add missing "const" to array declaration. 2014-07-30 20:25:29 +02:00
mxfenc.c avformat/mxfenc: rename very recently added option to set/force channelcount in MXF D-10 2014-06-27 03:29:51 +02:00
mxg.c
ncdec.c
network.c
network.h
nistspheredec.c
noproxy-test.c
nsvdec.c Merge commit '27c1f82f561932c83191bcd3e70e0cb1712485ba' 2014-07-09 23:26:18 +02:00
nullenc.c
nut.c
nut.h
nutdec.c Merge commit '52a1c32c0a86e84d43f977c5148e62975a0c6917' 2014-07-08 21:18:36 +02:00
nutenc.c
nuv.c
oggdec.c
oggdec.h
oggenc.c
oggparsecelt.c Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb' 2014-07-09 22:48:25 +02:00
oggparsedirac.c
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.c
options_table.h Add int64_t probesize2 instead of int probesize to AVFormatContext. 2014-07-30 11:09:25 +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
rawenc.h
rawvideodec.c
rdt.c
rdt.h
realtextdec.c
redspark.c
replaygain.c
replaygain.h
riff.c
riff.h
riffdec.c
riffenc.c
rl2.c
rm.c
rm.h
rmdec.c
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
rtp.c
rtp.h
rtpdec.c Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c' 2014-07-09 23:40:13 +02:00
rtpdec.h Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c' 2014-07-09 23:40:13 +02:00
rtpdec_amr.c Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c' 2014-07-09 23:40:13 +02:00
rtpdec_asf.c
rtpdec_formats.h
rtpdec_g726.c
rtpdec_h263.c
rtpdec_h263_rfc2190.c
rtpdec_h264.c Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c' 2014-07-09 23:40:13 +02:00
rtpdec_ilbc.c Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c' 2014-07-09 23:40:13 +02:00
rtpdec_jpeg.c Parse dri when receiving jpg via rtp. 2014-07-18 23:11:11 +02:00
rtpdec_latm.c Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c' 2014-07-09 23:40:13 +02:00
rtpdec_mpeg4.c Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c' 2014-07-09 23:40:13 +02:00
rtpdec_mpeg12.c
rtpdec_mpegts.c
rtpdec_qcelp.c
rtpdec_qdm2.c
rtpdec_qt.c
rtpdec_svq3.c
rtpdec_vp8.c
rtpdec_xiph.c Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c' 2014-07-09 23:40:13 +02:00
rtpenc.c
rtpenc.h
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c
rtpenc_chain.h
rtpenc_h263.c
rtpenc_h263_rfc2190.c
rtpenc_h264.c
rtpenc_jpeg.c Merge commit '39975acc699c83af0a87a7318c0f41e189142938' 2014-06-28 12:40:01 +02:00
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpproto.c
rtpproto.h
rtsp.c avformat/rtsp: use av_malloc_array() 2014-06-30 05:08:16 +02:00
rtsp.h
rtspcodes.h
rtspdec.c
rtspenc.c avformat/mux: support re-interleaving packets in ff_write_chained() 2014-07-24 22:39:22 +02:00
samidec.c
sapdec.c
sapenc.c avformat/mux: support re-interleaving packets in ff_write_chained() 2014-07-24 22:39:22 +02:00
sauce.c
sauce.h
sbgdec.c
sctp.c
sdp.c
sdr2.c
seek-test.c
seek.c avformat/seek: use av_malloc_array() 2014-07-19 19:44:56 +02:00
seek.h
segafilm.c
segment.c avformat/segment: re-interleave packets if needed 2014-07-24 23:22:33 +02:00
sierravmd.c
siff.c
smacker.c
smjpeg.c
smjpeg.h
smjpegdec.c
smjpegenc.c
smoothstreamingenc.c avformat/mux: support re-interleaving packets in ff_write_chained() 2014-07-24 22:39:22 +02:00
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
subfile.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 avformat/tee: flip assigment direction 2014-08-03 03:18:52 +02:00
thp.c
tiertexseq.c
tls.c
tmv.c
tta.c
tty.c
txd.c
udp.c
uncodedframecrcenc.c
unix.c
url-test.c
url.c
url.h Merge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15' 2014-07-27 02:09:41 +02:00
urldecode.c
urldecode.h
utils.c Add int64_t probesize2 instead of int probesize to AVFormatContext. 2014-07-30 11:09:25 +02:00
vc1test.c Merge commit '77fc7b76726719746ca45df6c4a62c41abad506e' 2014-07-06 19:25:12 +02:00
vc1testenc.c
version.h Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc' 2014-08-04 14:14:13 +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 avformat/wavdec: add basic sanity check for the sample count 2014-07-14 14:52:18 +02:00
wavenc.c avformat/wavenc: use av_mallocz_array() 2014-07-11 10:38:45 +00:00
wc3movie.c
webmdashenc.c lavf: Add WebM DASH Manifest Muxer 2014-07-15 23:58:36 +02:00
webvttdec.c
webvttenc.c
westwood_aud.c
westwood_vqa.c
wtv.h
wtv_common.c
wtvdec.c
wtvenc.c
wv.c
wv.h
wvdec.c
wvenc.c
xa.c
xmv.c
xwma.c
yop.c
yuv4mpeg.h
yuv4mpegdec.c
yuv4mpegenc.c Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb' 2014-07-09 23:34:33 +02:00