ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
e4e02a7d47
FFmpeg/libavformat
History
Philip Langdale 9d89c8b3ac matroskadec, matroskadec, srtenc: Read/Write duration for subtitles. 
After much discussion and back-and-forth, we reached the conclusion
that matroska uses convergence_duration for subtitle duration because
a 32bit value isn't large enough to store the duration if sub-micro-second
timebases are used. Matroska may not be the only one that supports these
timebases, but it's certainly the only one that ffmpeg attempts to support
in this way.

The long term solution that we seemed to reach was that if we encounter
a matroska file with a sub-micro-second timebase, we should internally
scale it up to at least micro-second, and then duration can be used
normally. This suggests that on the encode side, we should not allow
generation of files with sub-micro-second timebases, but that's a separate
issue.

That being a non-trivial change, and the subtitle interoperability breakage
being very real, I'm re-submitting this small change for consideration.

In this diff, we make sure that duration is populated by the matroska
demuxer, and that convergence_duration is respected in matroskaenc and
srtenc, but that duration is used otherwise. This ends up being a strict
improvement - pipelines that use convergence duration are unchanged, and
ones that are currently broken due to the duration mismatch will start
working - except for the ones with the extreme timebases, but those were
already broken.

Signed-off-by: Philip Langdale <philipl@overt.org>
2012-08-31 20:22:49 -07:00
..
4xm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
a64.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
aacdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ac3dec.c ac3dec: fix uninitialized var warning 2012-08-30 05:17:24 +02:00
act.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
adtsenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
adxdec.c Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
aea.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
aiff.h Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
aiffdec.c aiffdec: support QDM2 2012-08-28 03:18:21 +02:00
aiffenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
allformats.c Add ICO muxer 2012-08-14 16:54:25 +02:00
amr.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
anm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
apc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ape.c lavf/ape: Fix stream duration calculation 2012-08-23 15:51:51 +02:00
apetag.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
apetag.h Merge remote-tracking branch 'qatar/master' 2012-07-31 22:41:00 +02:00
apetagenc.c lavf/apetag: move common stuff between writer and reader to single file 2012-07-29 02:31:27 +00:00
asf.c Do not map asf metadata key WM/Track to track. 2011-12-31 22:33:58 +01:00
asf.h
asfcrypt.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
asfcrypt.h
asfdec.c asfdec: ignore too tiny indexes 2012-08-14 03:21:08 +02:00
asfenc.c Merge remote-tracking branch 'qatar/master' 2012-08-11 15:01:45 +02:00
assdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
assenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
au.c lavf/au: check bits per coded sample. 2012-08-18 17:45:58 +02:00
audiointerleave.c audiointerleave: check timebase 2012-04-01 21:21:13 +02:00
audiointerleave.h
avc.c Merge remote-tracking branch 'qatar/master' 2012-03-25 01:56:53 +01:00
avc.h Merge remote-tracking branch 'qatar/master' 2012-03-25 01:56:53 +01:00
avformat.h lavf: add use_wallclock_as_timestamps 2012-08-18 19:19:47 +02:00
avi.h Merge remote-tracking branch 'qatar/master' 2011-11-28 01:07:11 +01:00
avidec.c lavc: move AVRn to a seperate decoder. 2012-08-20 02:46:09 +02:00
avienc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
avio_internal.h lavf: split out ffio_limit() 2011-12-19 11:57:34 +01:00
avio.c Add 'rw_timeout' into URLContext 2012-08-29 00:05:03 +02:00
avio.h lavf/avio: flush internal buffer when calling avio_close() 2012-08-18 11:21:44 +02:00
aviobuf.c lavf: fix avio statistics for packets directly read without the buffer. 2012-08-25 23:25:36 +02:00
avisynth.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
avlanguage.c
avlanguage.h
avs.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
bethsoftvid.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
bfi.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
bink.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
bintext.c bintext: remove stray ; 2012-08-31 15:20:57 +02:00
bit.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
bluray.c bluray protocol 2012-03-03 04:30:49 +01:00
bmv.c Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
c93.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
cache.c cache: fix "warning: passing argument 2 of ‘av_tempfile’ from incompatible pointer type" 2012-02-06 02:04:09 +01:00
caf.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
caf.h
cafdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
cafenc.c rename missed CodecID to AVCodecID 2012-08-07 23:57:21 +02:00
cavsvideodec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
cdg.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
cdxl.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
concat.c Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
crcenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
crypto.c avio: add support for passing options to protocols. 2011-11-13 13:14:39 +01:00
cutils.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
daud.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dfa.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
diracdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dnxhddec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dsicin.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dtsdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dv.c dv: fix null ptr dereference 2012-08-16 04:25:07 +02:00
dv.h Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
dvenc.c Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
dxa.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
eacdata.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
electronicarts.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ffm.h
ffmdec.c Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
ffmenc.c ffmenc: switch to av_assert 2012-08-18 05:02:58 +02:00
ffmeta.h
ffmetadec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ffmetaenc.c Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
file.c lavf/file: cosmetic: Use "not" instead of "equals zero" 2012-07-05 10:55:49 +02:00
filmstripdec.c filmstripdec: add new line to error message 2012-08-31 23:03:18 +02:00
filmstripenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
flacdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
flacenc_header.c Merge remote-tracking branch 'qatar/master' 2011-12-11 01:05:33 +01:00
flacenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
flacenc.h
flic.c flic: use AV_LOG_ERROR for error message 2012-08-31 23:04:05 +02:00
flv.h Merge remote-tracking branch 'qatar/master' 2012-06-28 23:57:31 +02:00
flvdec.c flvdec: remove duplicate return 2012-08-31 15:45:23 +02:00
flvenc.c flvenc: kill a uninitialized variable warning. 2012-08-30 05:20:51 +02:00
framecrcenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
framehash.c frame{crc/md5}: set the stream timebase from codec timebase. 2012-02-03 09:29:02 +01:00
g723_1.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
g729dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
gif.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
gopher.c Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
gsmdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
gxf.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
gxf.h
gxfenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
h261dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
h263dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
h264dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
hls.c hls: fix min DTS code, try #2 2012-08-21 01:52:55 +02:00
hlsproto.c cosmetics: various spelling fixes 2012-07-06 17:08:22 +02:00
http.c http: try to detect live akamai streams and dont enable seeking for them 2012-06-28 00:18:24 +02:00
http.h cosmetics: various spelling fixes 2012-07-06 17:08:22 +02:00
httpauth.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
httpauth.h Merge remote-tracking branch 'qatar/master' 2012-03-14 02:10:11 +01:00
icodec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
icoenc.c Add ICO muxer 2012-08-14 16:54:25 +02:00
id3v1.c
id3v1.h Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
id3v2.c Merge remote-tracking branch 'qatar/master' 2012-08-12 13:43:03 +02:00
id3v2.h Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
id3v2enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
idcin.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
idroqdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
idroqenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
iff.c iff: replace av_abort by av_assert0 2012-08-10 16:26:39 +02:00
ilbc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
img2.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
img2dec.c lavf/img2dec: add and document pattern_type option 2012-08-08 23:43:36 +02:00
img2enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ingenientdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
internal.h lavf: factor ff_free_stream() out 2012-08-21 06:13:54 +02:00
ipmovie.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
isom.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
isom.h Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
iss.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
iv8.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ivfdec.c Merge remote-tracking branch 'qatar/master' 2012-06-21 22:37:43 +02:00
ivfenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
jacosubdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
jacosubenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
jvdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
latmenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
libavformat.v FireWire DV/HDV input device using libiec61883 2012-07-05 13:02:49 +02:00
libmodplug.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
libnut.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
librtmp.c Merge remote-tracking branch 'qatar/master' 2012-06-04 00:33:42 +02:00
lmlm4.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
loasdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
lxfdec.c Support reading 16-channel lxf files. 2012-08-16 10:20:25 +02:00
m4vdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
Makefile build: allow non-standard variations of linker -l/-L flags 2012-08-29 14:16:54 +01:00
matroska.c matroska: Mark S_TEXT/UTF-8 as Subrip encoded subtitles. 2012-08-25 13:15:41 -07:00
matroska.h Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
matroskadec.c matroskadec, matroskadec, srtenc: Read/Write duration for subtitles. 2012-08-31 20:22:49 -07:00
matroskaenc.c matroskadec, matroskadec, srtenc: Read/Write duration for subtitles. 2012-08-31 20:22:49 -07:00
md5enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
md5proto.c Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
metadata.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
metadata.h Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mgsts.c Enable generic index/seeking for mgsts demuxer. 2012-03-26 20:03:57 +02:00
microdvddec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
microdvdenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mkvtimestamp_v2.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mmf.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mms.c
mms.h Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
mmsh.c Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
mmst.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
mov_chan.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mov_chan.h Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
mov.c mov: fix av_log int type 2012-08-30 00:22:58 +02:00
movenc.c movenc: support for itunes tempo tag 2012-08-27 19:06:32 +02:00
movenc.h movenc: Handle need for extra packets to express subtitle duration. 2012-08-04 12:01:24 -07:00
movenchint.c Merge remote-tracking branch 'qatar/master' 2012-05-26 22:37:37 +02:00
mp3dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mp3enc.c mp3enc: fix const correctness 2012-08-30 17:56:38 +02:00
mpc8.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpc.c mpc: fix seeking to the end 2012-08-27 05:23:42 +02:00
mpeg.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpeg.h
mpegenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpegts.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpegts.h Merge remote-tracking branch 'qatar/master' 2012-02-29 00:30:35 +01:00
mpegtsenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpegvideodec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpjpeg.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
msnwc_tcp.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mtv.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mvi.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mxf.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mxf.h mxfdec: fix frame height vs field height confusion 2012-07-10 13:51:04 +02:00
mxfdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mxfenc.c lavf/mxfenc: better error handling with invalid frame rate. 2012-08-08 09:11:25 +02:00
mxg.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ncdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
network.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
network.h Merge remote-tracking branch 'qatar/master' 2012-07-16 20:45:41 +02:00
nsvdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
nullenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
nut.c nutenc: keep track of the written syncpoint count 2012-08-26 22:15:16 +02:00
nut.h nutenc: keep track of max_pts 2012-08-26 22:15:20 +02:00
nutdec.c Use correct format identifier for uint64_t. 2012-08-27 09:14:40 +02:00
nutenc.c nutenc: Support writing an index 2012-08-26 22:15:21 +02:00
nuv.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oggdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oggdec.h oggdec: add support for Opus codec. 2012-07-20 11:16:52 +02:00
oggenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oggparsecelt.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oggparsedirac.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oggparseflac.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oggparseogm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oggparseopus.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oggparseskeleton.c vorbisdemux: Check private context in theoras gtopts. 2012-03-23 04:29:33 +01:00
oggparsespeex.c Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
oggparsetheora.c oggparsetheora: fix metadata parsing 2012-08-12 23:09:45 +02:00
oggparsevorbis.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oma.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oma.h omadec: make sample rate table large enough to prevent out of array reading. 2012-04-16 18:36:39 +02:00
omadec.c omadec: switch to AVSTREAM_PARSE_FULL_RAW 2012-07-26 03:30:35 +02:00
omaenc.c Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
options_table.h lavf: add use_wallclock_as_timestamps 2012-08-18 19:19:47 +02:00
options.c options: Fix warning about incompatible pointer type 2012-07-30 03:48:46 +02:00
os_support.c Merge remote-tracking branch 'qatar/master' 2012-07-18 22:34:48 +02:00
os_support.h Merge remote-tracking branch 'qatar/master' 2012-06-30 22:44:18 +02:00
paf.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
pcm.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
pcm.h Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
pcmdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
pcmenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
pmpdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
psxstr.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
pva.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
qcp.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
qtpalette.h
r3d.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rawdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rawdec.h Merge remote-tracking branch 'qatar/master' 2012-02-01 02:36:09 +01:00
rawenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rawenc.h
rawvideodec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rdt.c rmdec: pass mime type to ff_rm_read_mdpr_codecdata() 2012-08-21 06:14:29 +02:00
rdt.h
realtextdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
riff.c Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
riff.h rename missed CodecID to AVCodecID 2012-08-07 23:57:21 +02:00
rl2.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rm.h rmdec: pass mime type to ff_rm_read_mdpr_codecdata() 2012-08-21 06:14:29 +02:00
rmdec.c rmdec: parse logical-fileinfo, instead of creating phantom tracks 2012-08-21 06:15:22 +02:00
rmenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rpl.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rso.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rso.h
rsodec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rsoenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtmp.h Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
rtmpcrypt.c Merge remote-tracking branch 'qatar/master' 2012-07-24 21:15:57 +02:00
rtmpcrypt.h Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
rtmpdh.c Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
rtmpdh.h Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
rtmphttp.c Merge remote-tracking branch 'qatar/master' 2012-07-18 01:27:19 +02:00
rtmppkt.c Merge remote-tracking branch 'qatar/master' 2012-08-02 23:34:01 +02:00
rtmppkt.h Merge remote-tracking branch 'qatar/master' 2012-08-02 23:34:01 +02:00
rtmpproto.c Merge remote-tracking branch 'qatar/master' 2012-08-23 14:33:33 +02:00
rtp.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtp.h Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_amr.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_asf.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_formats.h Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
rtpdec_g726.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_h263_rfc2190.c Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
rtpdec_h263.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_h264.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
rtpdec_ilbc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_latm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_mpeg4.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_qcelp.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_qdm2.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_qt.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_svq3.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_vp8.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_xiph.c rtpdec_xiph: switch to av_assert() 2012-08-24 13:44:25 +02:00
rtpdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec.h Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
rtpenc_aac.c
rtpenc_amr.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
rtpenc_chain.c Merge remote-tracking branch 'qatar/master' 2012-05-26 22:37:37 +02:00
rtpenc_chain.h Merge remote-tracking branch 'qatar/master' 2012-05-26 22:37:37 +02:00
rtpenc_h263_rfc2190.c rtpenc: Use MB info side data for splitting H263 packets for RFC 2190 2012-03-01 16:08:32 +02:00
rtpenc_h263.c Change all uses of restrict to use av_restrict instead. 2012-06-17 00:38:39 +02:00
rtpenc_h264.c Merge remote-tracking branch 'qatar/master' 2012-06-18 20:07:00 +02:00
rtpenc_latm.c
rtpenc_mpv.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
rtpenc_vp8.c
rtpenc_xiph.c rtpenc_xiph: switch to av_assert 2012-08-28 22:29:20 +02:00
rtpenc.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
rtpenc.h Merge remote-tracking branch 'qatar/master' 2012-07-22 05:05:02 +02:00
rtpproto.c Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
rtsp.c Merge remote-tracking branch 'qatar/master' 2012-08-27 16:32:44 +02:00
rtsp.h Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
rtspcodes.h Merge remote-tracking branch 'qatar/master' 2012-07-11 23:57:11 +02:00
rtspdec.c Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
rtspenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
samidec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
sapdec.c Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
sapenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
sauce.c
sauce.h
sbgdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
sctp.c sctp: add port missing error message 2012-07-25 20:31:16 +03:00
sdp.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
seek-test.c seek-test: support printing multiple packets 2012-05-04 14:40:22 +02:00
seek.c Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
seek.h Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
segafilm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
segment.c lavf/segment: fix computation of M3U8 segment target duration 2012-08-18 22:46:12 +02:00
sierravmd.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
siff.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
smacker.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
smjpeg.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
smjpeg.h Replace Libav with FFmpeg in license headers for files created by me 2012-06-29 01:58:34 +00:00
smjpegdec.c Replace Libav with FFmpeg in license headers for files created by me 2012-06-29 01:58:34 +00:00
smjpegenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
smush.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
sol.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
sox.h
soxdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
soxenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
spdif.c
spdif.h
spdifdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
spdifenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
srtdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
srtenc.c matroskadec, matroskadec, srtenc: Read/Write duration for subtitles. 2012-08-31 20:22:49 -07:00
subtitles.c lavf/subtitles: add some SMIL helpers. 2012-06-29 20:20:02 +02:00
subtitles.h lavf/subtitles: add some SMIL helpers. 2012-06-29 20:20:02 +02:00
subviewerdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
swf.c Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
swf.h Merge remote-tracking branch 'qatar/master' 2012-08-10 16:25:23 +02:00
swfdec.c Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
swfenc.c Merge remote-tracking branch 'qatar/master' 2012-08-10 16:25:23 +02:00
tcp.c Merge remote-tracking branch 'qatar/master' 2012-07-25 22:00:06 +02:00
thp.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
tiertexseq.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
tls.c Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
tmv.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
tta.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
tty.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
txd.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
udp.c Add 'timeout' option to UDP protocol 2012-08-29 00:28:07 +02:00
url.h Add 'rw_timeout' into URLContext 2012-08-29 00:05:03 +02:00
urldecode.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
urldecode.h Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
utils.c find_stream_info: update last_dts more often 2012-08-30 23:48:54 +02:00
vc1test.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vc1testenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
version.h lavf/segment: change default value for segment_list_size option, from 5 to 0 2012-08-18 12:32:23 +02:00
voc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
voc.h Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
vocdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vocenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vorbiscomment.c
vorbiscomment.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
vqf.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
wav.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
wc3movie.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
westwood_aud.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
westwood_vqa.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
wtv.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
wtv.h
wtvdec.c wtvdec: set correct codec ID for CC streams. 2012-08-31 19:58:09 +02:00
wtvenc.c rename missed CodecID to AVCodecID 2012-08-07 23:57:21 +02:00
wv.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
wvenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
xa.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
xmv.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
xwma.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
yop.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
yuv4mpeg.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00