virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
24,738 Commits 37 Branches 400 Tags 465 MiB
4bbb3e3a9d
Commit Graph

243 Commits

Author SHA1 Message Date
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
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
 2009-10-01 21:14:46 +00:00
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
 2009-10-01 21:14:05 +00:00
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
 2009-08-24 13:43:33 +00:00
Aurelien Jacobs
e26444079c matroskadec: factorize some code 
Originally committed as revision 19693 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-24 13:40:30 +00:00
Aurelien Jacobs
8306be9c3b matroskadec: disable h264 parser as long as it totally mess up frame type 
Originally committed as revision 19622 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-10 18:12:02 +00:00
Aurelien Jacobs
194d4b494b matroskadec: correctly parse flags for simpleblock frames 
Originally committed as revision 19621 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-10 18:06:14 +00:00
Daniel Verkamp
1a40491ef2 Add ff_ prefixes to exported symbols in libavformat/riff.h. 
patch by Daniel Verkamp, aniel drv nu

Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-22 23:09:34 +00:00
Aurelien Jacobs
4f909c7675 matroskadec: prepend TargetType to metadata key name 
Originally committed as revision 19184 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-13 22:29:38 +00:00
Benjamin Larsson
0871e65cf6 Remove unused code found by CSA 
Originally committed as revision 18783 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-10 14:33:40 +00:00
Aurelien Jacobs
719e721a14 Add some basic metadata conversion tables for matroska and asf. 
Add missing const qualifiers for metadata_conv in AV{In|Out}putFormat.

Originally committed as revision 17671 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-01 00:12:08 +00:00
Aurelien Jacobs
9ebeea82f0 matroskadec: return AVERROR_EOF upon detection of end of file 
Originally committed as revision 17460 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-19 21:01:45 +00:00
Aurelien Jacobs
f702df396d matroskadec: export language of metadata tags when available 
Originally committed as revision 17334 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 16:05:37 +00:00
Aurelien Jacobs
929e9de7a1 matroskadec: add generic metadata support 
Originally committed as revision 17331 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 15:53:55 +00:00
Aurelien Jacobs
325ace3efc matroskadec: read track and attachment uid 
will be useful for generic metadata support

Originally committed as revision 17330 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 15:34:22 +00:00
Aurelien Jacobs
38766e084f matroskadec: export track name through the metadata API 
Originally committed as revision 17329 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 15:29:09 +00:00
Aurelien Jacobs
6cb6e159f8 matroskadec: use new metadata API to export some simple information 
Originally committed as revision 17328 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 15:25:14 +00:00
Aurelien Jacobs
69b6d53beb cosmetics: whitespace 
Originally committed as revision 16951 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 21:32:11 +00:00