1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavformat
Michael Niedermayer 5a270296cb Merge commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce'
* commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce':
  hls: Store first_timestamp in units of AV_TIME_BASE

Conflicts:
	libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30 10:03:02 +02:00
..
4xm.c Merge commit '42d73f7f6bea0ee0f64a3ad4882860ce5b923a11' 2013-06-13 11:56:31 +02:00
a64.c
aacdec.c lavf/aacdec: add support for reading ape tags 2013-06-03 23:10:57 +00:00
ac3dec.c
act.c cosmetics: Fix "dont" "wont" "doesnt" typos 2013-06-29 02:31:16 +02:00
adp.c
adtsenc.c
adxdec.c
aea.c
afc.c
aiff.h Support decoding G.722 in aiff. 2013-06-09 01:10:36 +02:00
aiffdec.c Support decoding G.722 in aiff. 2013-06-09 01:10:36 +02:00
aiffenc.c
allformats.c lavf: add support for libgme 2013-07-02 18:52:45 +02:00
amr.c
anm.c
apc.c
ape.c
apetag.c apetag: do not require seekable output 2013-06-14 17:07:36 +00:00
apetag.h
aqtitledec.c
asf.c
asf.h asfdec: move packet_obj_size to ASFStream 2013-07-30 03:19:39 +02:00
asfcrypt.c
asfcrypt.h
asfdec.c asfdec: remove "ignoring invalid packet_obj_size" code 2013-07-30 03:19:39 +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 documented that av_codec_close is required to call 2013-07-24 12:49:01 +02:00
avi.h
avidec.c Merge commit 'c8f0b20b4a6bb6691928789d83e4b02896969848' 2013-07-28 13:15:21 +02:00
avienc.c
avio_internal.h avformat/aviobuf: Add ffio_ensure_seekback() 2013-07-04 19:13:38 +02:00
avio.c retry_transfer_wrapper(): check for interrupt before operation 2013-07-12 21:27:27 +02:00
avio.h
aviobuf.c avio: Don't set the seekable flag if no seek function is provided 2013-07-26 21:46:18 +03:00
avisynth.c miscellaneous typo fixes 2013-07-25 19:43:32 +02:00
avlanguage.c
avlanguage.h
avr.c
avs.c
bethsoftvid.c
bfi.c bfi: check return value of av_malloc() 2013-07-01 21:37:16 +00:00
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 Fix muxing QDM2 mono into caf. 2013-06-28 09:04:16 +02:00
cavsvideodec.c
cdg.c
cdxl.c
concat.c
concatdec.c Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef' 2013-06-17 00:09:31 +02:00
crcenc.c
crypto.c
cutils.c
data_uri.c
daud.c
dfa.c
diracdec.c
dnxhddec.c
dsicin.c
dtsdec.c avformat/dtsdec: Improve probe, reject things looking like analoge signals 2013-07-26 11:19:43 +02:00
dtshddec.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.c
filmstripdec.c
filmstripenc.c
flacdec_picture.c lavf/flacdec: Share the function to parse cover art blocks 2013-07-09 19:19:42 +02:00
flacdec.c lavf/flacdec: Share the function to parse cover art blocks 2013-07-09 19:19:42 +02:00
flacdec.h lavf/flacdec: Share the function to parse cover art blocks 2013-07-09 19:19:42 +02:00
flacenc_header.c
flacenc.c
flacenc.h
flic.c
flv.h
flvdec.c Remove unreachable returns 2013-07-27 16:00:41 +02:00
flvenc.c
format.c avformat: make av_register_*put_format() thread safe 2013-06-29 03:46:10 +02:00
framecrcenc.c
framehash.c
frmdec.c
ftp.c ftp: warning about pure-ftp server used as and output 2013-07-17 14:42:20 +02:00
g722.c
g723_1.c
g729dec.c
gif.c avformat/gif: Do not write GIF89a header if loop is set to -1. 2013-07-10 01:18:59 +02:00
gifdec.c
gopher.c
gsmdec.c Rename "AVClass class" as "AVClass component_class". 2013-06-30 13:47:45 +02:00
gxf.c Added codec ID to playback DNxHD 2013-06-29 18:02:37 +02:00
gxf.h
gxfenc.c avformat/gxfenc: Added support for writing correct auxiliary data for DV streams. 2013-07-25 22:01:12 +02:00
h261dec.c avformat/h261dec: use init_get_bits8() 2013-07-04 13:40:08 +02:00
h263dec.c
h264dec.c
hls.c Merge commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce' 2013-07-30 10:03:02 +02:00
hlsenc.c lavf/hlsenc: fix bogus hls segment index rewrapping logic 2013-06-06 12:09:38 +02:00
hlsproto.c
http.c Merge commit '0f51c398beac87682b2249662b97e30512f7868c' 2013-07-29 12:00:17 +02:00
http.h
httpauth.c
httpauth.h
icodec.c
icoenc.c
id3v1.c
id3v1.h
id3v2.c id2v2: check the return value of decode_str() 2013-06-09 17:25:39 +02:00
id3v2.h
id3v2enc.c
idcin.c idcin: check return value of av_malloc() 2013-07-01 22:04:48 +00:00
idroqdec.c
idroqenc.c
iff.c avformat/iff: Byte seek is unsupported 2013-06-20 21:49:02 +02:00
ilbc.c
img2.c
img2dec.c avformat/img2dec: timestamps are 64bit 2013-06-05 14:41:16 +02:00
img2enc.c img2enc: add option to use strftime() for filename 2013-07-19 01:45:37 +02:00
ingenientdec.c
internal.h avformat/utils: factor ff_find_last_ts() out of ff_gen_search() 2013-07-06 22:27:35 +02:00
ipmovie.c
ircam.c
ircam.h
ircamdec.c
ircamenc.c
isom.c isom: add xd51 hdcam , someone needs to binary search FCP for new isom... 2013-06-19 10:43:48 -04:00
isom.h avformat/mov: read stream bitrates from isml manifest 2013-07-08 17:36:45 +02:00
iss.c
iv8.c
ivfdec.c
ivfenc.c
jacosubdec.c
jacosubenc.c
jvdec.c
latmenc.c
libavformat.v
libgme.c lavf: add support for libgme 2013-07-02 18:52:45 +02:00
libmodplug.c avformat/libmodplug: Reduce the probe score for small input 2013-06-20 14:58:50 +02:00
libnut.c
libquvi.c
librtmp.c
lmlm4.c
loasdec.c
log2_tab.c
lvfdec.c
lxfdec.c lxfdec: remove wrong and unneeded check 2013-06-25 19:38:00 +00:00
m4vdec.c
Makefile lavf: add missing build dependency for tta demuxer 2013-07-12 19:51:48 +00:00
matroska.c
matroska.h matroskaenc: implement CueRelativePosition 2013-07-24 14:08:52 +02:00
matroskadec.c avformat/matroskadec: Detect conflicting sample rate/default_duration 2013-07-15 17:13:45 +02:00
matroskaenc.c matroskaenc: implement CueRelativePosition 2013-07-24 14:08:52 +02:00
md5enc.c lavf/md5enc: Use AV_HASH_MAX_SIZE 2013-06-15 18:50:11 -03:00
md5proto.c
metadata.c
metadata.h
mgsts.c
microdvddec.c
microdvdenc.c
mkvtimestamp_v2.c
mm.c
mmf.c
mms.c
mms.h
mmsh.c mmsh: reimplement seeking 2013-07-07 18:50:03 +02:00
mmst.c
mov_chan.c
mov_chan.h
mov.c Merge commit '31931520df35a6f9606fe8293c8a39e2d1fabedf' 2013-07-16 00:12:24 +02:00
movenc.c lavf/movenc: improve psp check 2013-07-28 17:05:05 +02:00
movenc.h Merge commit '7c020e1ad37d27c9d5db4d714401f09c80e3cc44' 2013-06-05 11:33:25 +02:00
movenchint.c Merge remote-tracking branch 'qatar/master' 2013-07-09 10:07:23 +02:00
mp3dec.c mp3dec: detect CBR and use CBR axiom to seek 2013-07-08 17:12:51 +02:00
mp3enc.c
mpc8.c
mpc.c
mpeg.c
mpeg.h
mpegenc.c
mpegts.c mpegts: only reopen pmt_cb filter if its different from the previous. 2013-07-05 04:02:02 +02:00
mpegts.h
mpegtsenc.c cosmetics: Fix "dont" "wont" "doesnt" typos 2013-06-29 02:31:16 +02:00
mpegvideodec.c
mpjpeg.c
mpl2dec.c
mpsubdec.c
msnwc_tcp.c
mtv.c
mux.c lavf/mux: rename variable cortag -> tagbuf2 in init_muxer() 2013-06-26 23:22:22 +02:00
mvdec.c
mvi.c
mxf.c
mxf.h
mxfdec.c Fix copying extradata to codec in mxfdec.c 2013-06-27 13:32:48 +02:00
mxfenc.c mxfenc: use ffio_fill() 2013-07-15 17:51:12 +00:00
mxg.c Use AV_RN32 for an unaligned read in the mxg demuxer. 2013-06-26 09:33:44 +02:00
ncdec.c
network.c ff_network_wait_fd_timeout(): check for interrupt before operation 2013-07-12 21:27:27 +02:00
network.h ff_network_wait_fd_timeout(): check for interrupt before operation 2013-07-12 21:27:27 +02:00
nistspheredec.c
noproxy-test.c Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c' 2013-06-16 23:45:42 +02:00
nsvdec.c Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a' 2013-06-03 11:53:05 +02:00
nullenc.c
nut.c
nut.h
nutdec.c nutdec: use ff_find_last_ts() 2013-07-06 22:27:35 +02:00
nutenc.c Merge commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d' 2013-07-28 13:23:54 +02:00
nuv.c
oggdec.c Merge remote-tracking branch 'qatar/master' 2013-07-02 11:50:30 +02:00
oggdec.h
oggenc.c oggenc: Write stream metadata if available 2013-07-28 21:10:51 +02:00
oggparsecelt.c
oggparsedirac.c
oggparseflac.c
oggparseogm.c
oggparseopus.c
oggparseskeleton.c oggparseskeleton: avoid header parsing failure 2013-07-06 23:53:19 +02:00
oggparsespeex.c
oggparsetheora.c
oggparsevorbis.c oggparsevorbis: Support official chapter extension 2013-07-14 22:15:55 +02:00
oma.c
oma.h
omadec.c Merge commit '2219e27b5b17d146e4ab71a3ed86dfc013fb7a93' 2013-07-29 13:01:20 +02:00
omaenc.c
options_table.h lavf: fix documentation for avoid_negative_ts 2013-07-05 00:58:03 +02: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
rawdec.h
rawenc.c
rawenc.h
rawvideodec.c
rdt.c
rdt.h
realtextdec.c
redspark.c
riff.c lavf/riff: Add ITRK tag 2013-07-18 10:55:23 +02:00
riff.h
rl2.c
rm.c
rm.h
rmdec.c rmdec: Forward error messages from rm_assemble_video_frame() to the caller. 2013-07-13 17:16:30 +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
rtp.c
rtp.h
rtpdec_amr.c
rtpdec_asf.c
rtpdec_formats.h
rtpdec_g726.c
rtpdec_h263_rfc2190.c
rtpdec_h263.c
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
rtpdec.c Merge remote-tracking branch 'qatar/master' 2013-06-07 10:17:20 +02:00
rtpdec.h
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c
rtpenc_chain.h
rtpenc_h263_rfc2190.c
rtpenc_h263.c
rtpenc_h264.c
rtpenc_jpeg.c
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c
rtpenc.h Merge commit '1297f7b87f8a84930a23eca705765c7c353dfcd5' 2013-07-27 08:58:26 +02:00
rtpproto.c Merge commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9' 2013-07-20 10:39:53 +02:00
rtsp.c Merge commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9' 2013-07-20 10:39:53 +02:00
rtsp.h Merge commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9' 2013-07-20 10:39:53 +02:00
rtspcodes.h
rtspdec.c Merge commit '1dd1b2332ebbac710d8e0214cec7595e118f2105' 2013-07-15 12:38:24 +02:00
rtspenc.c
samidec.c
sapdec.c
sapenc.c
sauce.c
sauce.h
sbgdec.c
sctp.c
sdp.c
seek-test.c
seek.c
seek.h
segafilm.c
segment.c lavf/segment: use AV_OPT_TIME_DURATION for time_delta 2013-07-11 00:36:53 +02:00
sierravmd.c
siff.c
smacker.c Merge remote-tracking branch 'qatar/master' 2013-06-17 01:04:33 +02:00
smjpeg.c
smjpeg.h
smjpegdec.c
smjpegenc.c
smoothstreamingenc.c
smush.c
sol.c
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c
spdifenc.c Rename "AVClass class" as "AVClass component_class". 2013-06-30 13:47:45 +02:00
srtdec.c
srtenc.c
srtp.c
srtp.h
srtpproto.c
subtitles.c
subtitles.h
subviewer1dec.c
subviewerdec.c
swf.c
swf.h
swfdec.c
swfenc.c Merge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3' 2013-07-26 10:43:12 +02:00
takdec.c lavf/takdec: check metadata blocks checksum 2013-07-10 12:07:53 +00:00
tcp.c tcp: Use a default timeout of 5 sec for opening a connection but not for receiving packets 2013-07-06 01:33:19 +02:00
tedcaptionsdec.c
tee.c lavf/tee: pesudo → pseudo. 2013-06-06 20:29:38 +02:00
thp.c
tiertexseq.c
tls.c
tmv.c
tta.c tta: read ape tags last 2013-06-16 18:56:56 +00:00
tty.c
txd.c
udp.c udp: Fix receiving large udp packets 2013-06-29 00:10:15 +02:00
url-test.c Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef' 2013-06-17 00:09:31 +02:00
url.c Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef' 2013-06-17 00:09:31 +02:00
url.h Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef' 2013-06-17 00:09:31 +02:00
urldecode.c
urldecode.h
utils.c Merge commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34' 2013-07-29 13:14:29 +02:00
vc1test.c
vc1testenc.c
version.h Supply a User-Agent header when opening rtsp streams. 2013-07-11 23:05:53 +02:00
vivo.c
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c vorbiscomment: Add DESCRIPTION to ff_vorbiscomment_metadata_conv 2013-07-18 12:03:21 +02:00
vorbiscomment.h
vplayerdec.c
vqf.c
w64.c
w64.h
wavdec.c avformat/wavdec: Dont rescale timestamps but use exact comparission 2013-06-08 20:02:22 +02:00
wavenc.c
wc3movie.c
webvttdec.c lavf/webvttdec: use private option to specify WebVTT kind 2013-06-25 00:13:47 +02:00
webvttenc.c lavf: add WebVTT muxer. 2013-06-17 22:28:19 +02:00
westwood_aud.c
westwood_vqa.c Merge commit 'f054e309c58894450a5d18cce9799ef58aab9f14' 2013-07-08 05:02:52 +02:00
wtv.c wtv: Drop some casts that now are unnecessary 2013-07-26 23:05:18 +03:00
wtv.h Merge commit '86f042dcabde2a5386dbd95ab0451b274987d253' 2013-07-27 09:19:58 +02:00
wtvdec.c Merge remote-tracking branch 'qatar/master' 2013-07-27 09:43:29 +02:00
wtvenc.c
wv.c
wv.h
wvdec.c
wvenc.c
xa.c xa: abort if number of channels or sample rate is 0 2013-06-25 22:24:55 +00:00
xmv.c
xwma.c
yop.c
yuv4mpeg.c yuv4mpeg: Correctly round chroma up for odd luma sizes 2013-07-07 13:30:22 +03:00