generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
27,751 Commits 24 Branches 241 Tags 173 MiB
e9eb8d0bce
Commit Graph

260 Commits

Author SHA1 Message Date
Anton Khirnov
e9eb8d0bce avio: avio: avio_ prefixes for put_* functions 
In the name of consistency:
put_byte           -> avio_w8
put_<type>         -> avio_w<type>
put_buffer         -> avio_write

put_nbyte will be made private
put_tag will be merged with avio_put_str

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 77eb5504d3)
 2011-02-22 02:44:38 +01:00
Anton Khirnov
e63a362857 avio: avio_ prefixes for get_* functions 
In the name of consistency:
get_byte           -> avio_r8
get_<type>         -> avio_r<type>
get_buffer         -> avio_read

get_partial_buffer will be made private later

get_strz is left out becase I want to change it later to return
something useful.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b7effd4e83)
 2011-02-22 02:44:37 +01:00
Anton Khirnov
ae99313aa5 avio: move init_put_byte() to a new private header and rename it 
init_put_byte should never be used outside of lavf, since
sizeof(AVIOContext) isn't part of public ABI.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e731b8d872)
 2011-02-20 19:05:47 +01:00
Anton Khirnov
471fe57e1a avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd)
 2011-02-20 19:05:47 +01:00
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)
 2011-02-09 03:31:17 +01:00
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)
 2011-01-28 03:15:34 +01:00
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
 2010-11-03 06:29:04 +00:00
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
 2010-10-16 13:20:41 +00:00
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
 2010-10-15 19:04:25 +00:00
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
 2010-09-06 17:51:44 +00:00
Aurelien Jacobs
4a194c8f47 matroskadec: allow uint and float elements with length = 0 
Originally committed as revision 25044 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-05 21:37:40 +00:00
Reimar Döffinger
ff6a5fc1f0 Optimize/simplify ebml_read_num. 
Originally committed as revision 25026 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-02 19:17:46 +00:00
Aurelien Jacobs
e110e968fe matroskadec: minor simplification 
patch from reimar

Originally committed as revision 24804 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-17 14:25:14 +00:00
Aurelien Jacobs
4f90688b6e matroskadec: fix integer overflow 
patch from reimar

Originally committed as revision 24803 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-17 14:05:23 +00:00
Alex Converse
f7cf0f3148 Add WebM to the Matroska demuxer name. 
Originally committed as revision 24639 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-01 00:30:37 +00:00
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
 2010-07-02 16:41:38 +00:00
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
 2010-07-02 16:38:44 +00:00
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
 2010-06-15 19:53:15 +00:00
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
 2010-06-11 17:16:43 +00:00
Aurelien Jacobs
739178107c matroskadec: cosmetic: indentation 
Originally committed as revision 23590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-11 16:45:38 +00:00
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
 2010-06-11 16:43:47 +00:00
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
 2010-06-11 16:36:51 +00:00
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
 2010-06-11 16:34:01 +00:00
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
 2010-06-11 16:27:30 +00:00
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
 2010-06-08 19:31:08 +00:00
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
 2010-06-08 19:28:22 +00:00
Aurelien Jacobs
37dd235658 matroskadec: avoid potential crash after r23169 
Originally committed as revision 23330 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-25 22:55:12 +00:00
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
 2010-05-23 22:20:04 +00:00
David Conrad
c7b913c8ad matroskadec: Allow unknown EBML doctype 
Originally committed as revision 23246 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-22 01:41:35 +00:00
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
 2010-05-22 01:41:32 +00:00
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
 2010-05-18 21:21:37 +00:00
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
 2010-05-18 21:21:32 +00:00
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
 2010-05-18 21:21:28 +00:00
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
 2010-05-18 21:21:23 +00:00
Baptiste Coudurier
1095d44258 set avg frame rate in mkv demuxer 
Originally committed as revision 23152 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-17 18:12:58 +00:00
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
 2010-04-25 14:27:42 +00:00
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
 2010-04-20 21:23:49 +00:00
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
 2010-04-20 21:19:27 +00:00
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
 2010-04-20 14:45:34 +00:00
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
 2010-04-11 21:44:23 +00:00
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
 2010-03-31 12:29:58 +00:00
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
 2010-03-30 23:30:55 +00:00
Aurelien Jacobs
e536ccd653 matroskadec: use more appropriate error code 
Originally committed as revision 22535 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 00:19:22 +00:00
Aurelien Jacobs
6b10228a55 matroskadec: add support for SIPR audio tracks 
Originally committed as revision 22492 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 23:49:06 +00:00
David Conrad
e48f7ff3cb matroskadec: Fix a buffer overread 
Originally committed as revision 22271 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-07 02:26:30 +00:00
Aurelien Jacobs
68b0fd7c68 matroskadec: cosmetic indentation 
Originally committed as revision 22185 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 21:49:24 +00:00
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
 2010-03-03 21:46:43 +00:00
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
 2010-02-01 11:39:10 +00:00
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
 2010-01-11 00:31:55 +00:00
Aurelien Jacobs
553e9f7529 matroskadec: cosmetics: indentation 
Originally committed as revision 20133 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 21:15:36 +00:00