Reimar Döffinger
14d735bd4f
matroskadec: add generic element length validation.
...
This validate the length of a mkv element directly after reading
it.
This has the advantage that it is easy to add new limits and makes
it less likely to forget to add checks and also avoids issues like
bits of the length value above the first 32 being ignored because
the parsing functions only takes an int.
Previously discussed in the "mkv 0-byte integer parsing" thread.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 95ec3d4cac
)
14 years ago
Diego Elio Pettenò
66355be3c3
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
...
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
(cherry picked from commit c6610a216e
)
14 years ago
Anton Khirnov
bf800c7db8
matroskadec: skip invalid tags with no TagName
...
fixes segfault in issue 2328
Originally committed as revision 25659 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Anton Khirnov
ad7768f4c4
add ff_ prefix to metadata_conv()
...
patch by Anton Khirnov anton _at_ khirnov _dot_ net
Originally committed as revision 25505 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Anton Khirnov
03700d399b
Export metadata in the generic format. Deprecate old conversion API.
...
patch by Anton Khirnov anton _at_ khirnov _dot_ net
Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Reimar Döffinger
1b4d327b1c
Add a special function to mkv demxuer to parse length values that includes
...
special-case code to handle all possible encodings of "unknown length".
Originally committed as revision 25049 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Aurelien Jacobs
4a194c8f47
matroskadec: allow uint and float elements with length = 0
...
Originally committed as revision 25044 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Reimar Döffinger
ff6a5fc1f0
Optimize/simplify ebml_read_num.
...
Originally committed as revision 25026 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Aurelien Jacobs
e110e968fe
matroskadec: minor simplification
...
patch from reimar
Originally committed as revision 24804 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Aurelien Jacobs
4f90688b6e
matroskadec: fix integer overflow
...
patch from reimar
Originally committed as revision 24803 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Alex Converse
f7cf0f3148
Add WebM to the Matroska demuxer name.
...
Originally committed as revision 24639 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
David Conrad
41c1ccc332
matroskadec: merge only SSA packets together
...
fixes issue 2052
patch by David Conrad
Originally committed as revision 24004 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
7a617a8634
add AV_DISPOSITION_FORCED flag and use it in matroska demuxer
...
Originally committed as revision 24003 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
0ade7bb6e9
matroskadec : propagate AVERROR to the caller
...
based on a patch by Jai Menon
Originally committed as revision 23619 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
bddd1d93e5
matroskadec: fix type of the length field in ebml_read_master()
...
Also use the correct value for unknown size (instead of a truncated
and sign extended value).
Originally committed as revision 23591 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
739178107c
matroskadec: cosmetic: indentation
...
Originally committed as revision 23590 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
8dbe48fccb
matroskadec: add support for live broadcast containing unknown size clusters
...
This interrupt parsing and goes one ebml level up when encountering
a cluster start inside an unknown sized element which is not supposed to
contain a cluster.
fix issue1991
Originally committed as revision 23589 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
80702035d2
matroskadec: simplify parsing of the first cluster
...
Now that we save the currently parsed ebml element ID after an interruption,
we don't need to special case the parsing of the first cluster.
Originally committed as revision 23588 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
c3ade62ca3
matroskadec: store the ID of the currently parsed ebml element
...
This allows to interrupt parsing after reading an ID, and then properly
recover parsing.
Originally committed as revision 23587 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
6c58adf3b7
matroskadec: cosmetic: split a line to make it more readable
...
This also simplifies further modifications.
Originally committed as revision 23586 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Reimar Döffinger
120a083fb7
Do not attempt to seek to index for streamed files and if the user explicitly
...
requested us not to read the index.
Originally committed as revision 23540 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Reimar Döffinger
c31f00ed63
Fix the MATROSKA_ID_TAGDEFAULT to match the specification (instead of
...
libmatroska etc. typo) but continue to support the "old" value.
Originally committed as revision 23539 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
37dd235658
matroskadec: avoid potential crash after r23169
...
Originally committed as revision 23330 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
David Conrad
8daed34e48
matroskadec: Revert adding the doctype to metadata; it has no meaning elsewhere
...
Originally committed as revision 23275 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
David Conrad
c7b913c8ad
matroskadec: Allow unknown EBML doctype
...
Originally committed as revision 23246 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
James Zern
470491faed
matroskadec: Support webm doctype
...
Patch by James Zern <jzern at google>
Originally committed as revision 23245 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
David Conrad
5549aa6d0d
matroskadec: Free ebml binary buffer on error
...
Based on a Chromium patch
Originally committed as revision 23169 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
David Conrad
465c28b6b4
matroskadec: Fix buffer overread in matroska_ebmlnum_uint
...
Based on a Chromium patch
Originally committed as revision 23168 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
David Conrad
d98bd80ed3
matroskadec: Ensure time_scale is nonzero, fixes divide-by-zero if the file
...
has 0 written
Based on a Chromium patch
Originally committed as revision 23167 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
David Conrad
1c664b239c
matroskadec: Use av_freep in ebml_read_ascii
...
Based on a Chromium patch
Originally committed as revision 23166 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Baptiste Coudurier
1095d44258
set avg frame rate in mkv demuxer
...
Originally committed as revision 23152 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Stefano Sabatini
2ef6c1242a
Mark av_metadata_set() as deprecated, and use av_metadata_set2()
...
in its place.
av_metadata_set() is going to be dropped at the next major bump.
Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Baptiste Coudurier
f7501a71a1
seems aac gets screwed up by the parser so disable it
...
Originally committed as revision 22926 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Baptiste Coudurier
dc1c26dc8e
parse stream headers for audio streams in mkv, needed for frame size
...
Originally committed as revision 22925 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Diego Biurrun
ba87f0801d
Remove explicit filename from Doxygen @file commands.
...
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.
Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Stefano Sabatini
9a2cb05ff9
Move the internal function declarations in avformat.h to internal.h.
...
Originally committed as revision 22843 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Jean-Daniel Dupas
cc947f04cc
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
...
Patch by Jean-Daniel Dupas, devlists shadowlab org
Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Stefano Sabatini
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
e536ccd653
matroskadec: use more appropriate error code
...
Originally committed as revision 22535 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
6b10228a55
matroskadec: add support for SIPR audio tracks
...
Originally committed as revision 22492 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
David Conrad
e48f7ff3cb
matroskadec: Fix a buffer overread
...
Originally committed as revision 22271 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
68b0fd7c68
matroskadec: cosmetic indentation
...
Originally committed as revision 22185 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Joakim Plate
3e93c8ed14
matroskadec: timestamps are dts and not pts in ms vfw compatibility mode
...
original patch by elupus _at_ ecce _dot_ se
Originally committed as revision 22184 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Anton Khirnov
ca76a11948
Add a list of generic tags and change demuxers to follow it.
...
Patch by Anton Khirnov, wyskas at gmail dot com
Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
David Conrad
18ca491bf1
mkvdec: Avoid divide-by-zero crash on invalid real audio tracks
...
Originally committed as revision 21129 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
553e9f7529
matroskadec: cosmetics: indentation
...
Originally committed as revision 20133 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
ff0d5a745e
matroskadec: don't overwrite extradata already read by ff_get_wav_header()
...
Originally committed as revision 20132 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
038146e9cf
matroskadec: fix handling of A_MS/ACM track with no extradata
...
Originally committed as revision 20131 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
429eeecd5a
matroskadec: add correct extradata offset for V_MS/VFW/FOURCC tracks
...
Originally committed as revision 19694 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
e26444079c
matroskadec: factorize some code
...
Originally committed as revision 19693 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago