Statistics
| Branch: | Revision:

ffmpeg / libavformat / matroskadec.c @ da9e6c42

History | View | Annotate | Download (67.8 KB)

# Date Author Comment
37dd2356 05/25/2010 10:55 PM Aurelien Jacobs

matroskadec: avoid potential crash after r23169

Originally committed as revision 23330 to svn://svn.ffmpeg.org/ffmpeg/trunk

8daed34e 05/23/2010 10:20 PM David Conrad

matroskadec: Revert adding the doctype to metadata; it has no meaning elsewhere

Originally committed as revision 23275 to svn://svn.ffmpeg.org/ffmpeg/trunk

c7b913c8 05/22/2010 01:41 AM David Conrad

matroskadec: Allow unknown EBML doctype

Originally committed as revision 23246 to svn://svn.ffmpeg.org/ffmpeg/trunk

470491fa 05/22/2010 01:41 AM James Zern

matroskadec: Support webm doctype

Patch by James Zern <jzern at google>

Originally committed as revision 23245 to svn://svn.ffmpeg.org/ffmpeg/trunk

5549aa6d 05/18/2010 09:21 PM David Conrad

matroskadec: Free ebml binary buffer on error

Based on a Chromium patch

Originally committed as revision 23169 to svn://svn.ffmpeg.org/ffmpeg/trunk

465c28b6 05/18/2010 09:21 PM David Conrad

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

d98bd80e 05/18/2010 09:21 PM David Conrad

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

1c664b23 05/18/2010 09:21 PM David Conrad

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

1095d442 05/17/2010 06:12 PM Baptiste Coudurier

set avg frame rate in mkv demuxer

Originally committed as revision 23152 to svn://svn.ffmpeg.org/ffmpeg/trunk

2ef6c124 04/25/2010 02:27 PM Stefano Sabatini

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

f7501a71 04/20/2010 09:23 PM Baptiste Coudurier

seems aac gets screwed up by the parser so disable it

Originally committed as revision 22926 to svn://svn.ffmpeg.org/ffmpeg/trunk

dc1c26dc 04/20/2010 09:19 PM Baptiste Coudurier

parse stream headers for audio streams in mkv, needed for frame size

Originally committed as revision 22925 to svn://svn.ffmpeg.org/ffmpeg/trunk

ba87f080 04/20/2010 02:45 PM Diego Biurrun

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

9a2cb05f 04/11/2010 09:44 PM Stefano Sabatini

Move the internal function declarations in avformat.h to internal.h.

Originally committed as revision 22843 to svn://svn.ffmpeg.org/ffmpeg/trunk

cc947f04 03/31/2010 12:29 PM Jean-Daniel Dupas

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

72415b2a 03/30/2010 11:30 PM Stefano Sabatini

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

e536ccd6 03/15/2010 12:19 AM Aurelien Jacobs

matroskadec: use more appropriate error code

Originally committed as revision 22535 to svn://svn.ffmpeg.org/ffmpeg/trunk

6b10228a 03/12/2010 11:49 PM Aurelien Jacobs

matroskadec: add support for SIPR audio tracks

Originally committed as revision 22492 to svn://svn.ffmpeg.org/ffmpeg/trunk

e48f7ff3 03/07/2010 02:26 AM David Conrad

matroskadec: Fix a buffer overread

Originally committed as revision 22271 to svn://svn.ffmpeg.org/ffmpeg/trunk

68b0fd7c 03/03/2010 09:49 PM Aurelien Jacobs

matroskadec: cosmetic indentation

Originally committed as revision 22185 to svn://svn.ffmpeg.org/ffmpeg/trunk

3e93c8ed 03/03/2010 09:46 PM Joakim Plate

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

ca76a119 02/01/2010 11:39 AM Anton Khirnov

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

18ca491b 01/11/2010 12:31 AM David Conrad

mkvdec: Avoid divide-by-zero crash on invalid real audio tracks

Originally committed as revision 21129 to svn://svn.ffmpeg.org/ffmpeg/trunk

553e9f75 10/01/2009 09:15 PM Aurelien Jacobs

matroskadec: cosmetics: indentation

Originally committed as revision 20133 to svn://svn.ffmpeg.org/ffmpeg/trunk

ff0d5a74 10/01/2009 09:14 PM Aurelien Jacobs

matroskadec: don't overwrite extradata already read by ff_get_wav_header()

Originally committed as revision 20132 to svn://svn.ffmpeg.org/ffmpeg/trunk

038146e9 10/01/2009 09:14 PM Aurelien Jacobs

matroskadec: fix handling of A_MS/ACM track with no extradata

Originally committed as revision 20131 to svn://svn.ffmpeg.org/ffmpeg/trunk

429eeecd 08/24/2009 01:43 PM Aurelien Jacobs

matroskadec: add correct extradata offset for V_MS/VFW/FOURCC tracks

Originally committed as revision 19694 to svn://svn.ffmpeg.org/ffmpeg/trunk

e2644407 08/24/2009 01:40 PM Aurelien Jacobs

matroskadec: factorize some code

Originally committed as revision 19693 to svn://svn.ffmpeg.org/ffmpeg/trunk

8306be9c 08/10/2009 06:12 PM Aurelien Jacobs

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

194d4b49 08/10/2009 06:06 PM Aurelien Jacobs

matroskadec: correctly parse flags for simpleblock frames

Originally committed as revision 19621 to svn://svn.ffmpeg.org/ffmpeg/trunk

1a40491e 06/22/2009 11:09 PM Daniel Verkamp

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

4f909c76 06/13/2009 10:29 PM Aurelien Jacobs

matroskadec: prepend TargetType to metadata key name

Originally committed as revision 19184 to svn://svn.ffmpeg.org/ffmpeg/trunk

0871e65c 05/10/2009 02:33 PM Benjamin Larsson

Remove unused code found by CSA

Originally committed as revision 18783 to svn://svn.ffmpeg.org/ffmpeg/trunk

719e721a 03/01/2009 12:12 AM Aurelien Jacobs

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

9ebeea82 02/19/2009 09:01 PM Aurelien Jacobs

matroskadec: return AVERROR_EOF upon detection of end of file

Originally committed as revision 17460 to svn://svn.ffmpeg.org/ffmpeg/trunk

f702df39 02/15/2009 04:05 PM Aurelien Jacobs

matroskadec: export language of metadata tags when available

Originally committed as revision 17334 to svn://svn.ffmpeg.org/ffmpeg/trunk

929e9de7 02/15/2009 03:53 PM Aurelien Jacobs

matroskadec: add generic metadata support

Originally committed as revision 17331 to svn://svn.ffmpeg.org/ffmpeg/trunk

325ace3e 02/15/2009 03:34 PM Aurelien Jacobs

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

38766e08 02/15/2009 03:29 PM Aurelien Jacobs

matroskadec: export track name through the metadata API

Originally committed as revision 17329 to svn://svn.ffmpeg.org/ffmpeg/trunk

6cb6e159 02/15/2009 03:25 PM Aurelien Jacobs

matroskadec: use new metadata API to export some simple information

Originally committed as revision 17328 to svn://svn.ffmpeg.org/ffmpeg/trunk

69b6d53b 02/02/2009 09:32 PM Aurelien Jacobs

cosmetics: whitespace

Originally committed as revision 16951 to svn://svn.ffmpeg.org/ffmpeg/trunk

0b178e56 02/02/2009 08:16 PM Reimar Döffinger

Add av_ prefix to LZO stuff and thus make it officially part of the public API.
Keep lzo1x_decode until the next major version bump for binary compatibility.

Originally committed as revision 16946 to svn://svn.ffmpeg.org/ffmpeg/trunk

bad5537e 02/01/2009 02:00 AM Diego Biurrun

Use full internal pathname in doxygen @file directives.
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk

0e169d16 01/18/2009 05:26 PM Aurelien Jacobs

matroskadec: merge ByteIOContext declarations at upper level

Originally committed as revision 16673 to svn://svn.ffmpeg.org/ffmpeg/trunk

68a71451 01/18/2009 05:13 PM Aurelien Jacobs

matroskadec: parse the WAVEFORMATEX header and discard it from extradata

Originally committed as revision 16672 to svn://svn.ffmpeg.org/ffmpeg/trunk

e0e4be59 01/15/2009 12:42 AM Aurelien Jacobs

matroskadec: ensure we only consider chapters which are properly ordered

Originally committed as revision 16612 to svn://svn.ffmpeg.org/ffmpeg/trunk

b250f9c6 01/13/2009 11:44 PM Aurelien Jacobs

Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk

6a5d31ac 01/11/2009 10:19 PM Diego Biurrun

Fix build: Add intreadwrite.h and bswap.h #includes where necessary.

Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk

1ca610c0 12/19/2008 01:00 AM Alexander Strange

Allocate and clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of mkv
extradata.

Fixes valgrind invalid read warnings during H.264 extradata parsing.

Originally committed as revision 16229 to svn://svn.ffmpeg.org/ffmpeg/trunk

8f569ed0 11/15/2008 03:34 PM Aurelien Jacobs

matroskadec: fix index timestamps for some broken files
fix issue697

Originally committed as revision 15829 to svn://svn.ffmpeg.org/ffmpeg/trunk

37d3e066 10/21/2008 09:40 PM Aurelien Jacobs

uses FF_ARRAY_ELEMS() where appropriate

Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk

bc5c918e 10/03/2008 10:16 AM Diego Biurrun

Remove offset_t typedef and use int64_t directly instead.
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.

Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk

c58e8bd3 10/02/2008 09:15 PM Aurelien Jacobs

matroskadec: cosmetics: indentation

Originally committed as revision 15529 to svn://svn.ffmpeg.org/ffmpeg/trunk

21a115d1 10/02/2008 09:14 PM Aurelien Jacobs

matroskadec: don't merge packets which have no timestamp

Originally committed as revision 15528 to svn://svn.ffmpeg.org/ffmpeg/trunk

d5e34dcb 09/28/2008 11:06 PM Aurelien Jacobs

matroskadec: merge ASS events which share the same pts in the same AVPavket

Originally committed as revision 15455 to svn://svn.ffmpeg.org/ffmpeg/trunk

3df2be9f 09/28/2008 11:01 PM Aurelien Jacobs

matroskadec: ass events lines must end with a DOS style EOL

Originally committed as revision 15454 to svn://svn.ffmpeg.org/ffmpeg/trunk

1bb4a1a1 09/28/2008 10:58 PM Aurelien Jacobs

matroskadec: set duration only for CODEC_ID_TEXT subtitles

Originally committed as revision 15453 to svn://svn.ffmpeg.org/ffmpeg/trunk

e7d4b743 09/28/2008 10:55 PM Aurelien Jacobs

matroskadec: pass duration as parameter of matroska_fix_ass_packet()

Originally committed as revision 15452 to svn://svn.ffmpeg.org/ffmpeg/trunk

a8fd7e76 09/12/2008 12:06 AM Aurelien Jacobs

matroskadec: simplify, first_timecode is already in the index
no need to duplicate it

Originally committed as revision 15302 to svn://svn.ffmpeg.org/ffmpeg/trunk

5358a81f 09/11/2008 10:42 PM Aurelien Jacobs

matroskadec: prevent seeking before the first keyframe of the reference stream

Originally committed as revision 15301 to svn://svn.ffmpeg.org/ffmpeg/trunk

c1658257 09/09/2008 12:10 PM Aurelien Jacobs

matroskadec: demux relevant subtitle packets after a seek
only works for subtitle tracks which were properly indexed up to the seek point

Originally committed as revision 15284 to svn://svn.ffmpeg.org/ffmpeg/trunk

82360e67 09/09/2008 12:07 PM Aurelien Jacobs

matroskadec: ensure that overlapping subtitles are not added to the index

Originally committed as revision 15283 to svn://svn.ffmpeg.org/ffmpeg/trunk

20f74665 09/09/2008 12:01 PM Aurelien Jacobs

matroskadec: after seeking, skip up to the desired timestamp instead of
the desired stream

Originally committed as revision 15282 to svn://svn.ffmpeg.org/ffmpeg/trunk

f14a201b 09/09/2008 11:54 AM Aurelien Jacobs

matroskadec: move timecode calculation a little earlier
so as to be able to use it in other part of the code

Originally committed as revision 15281 to svn://svn.ffmpeg.org/ffmpeg/trunk

3fc9d7ce 09/09/2008 11:23 AM Aurelien Jacobs

matroskadec: sanitize track time_scale before using it
fix issue628

Originally committed as revision 15280 to svn://svn.ffmpeg.org/ffmpeg/trunk

a3467f86 09/06/2008 11:44 PM Aurelien Jacobs

matroskadec: remove now useless vstream and is_video_key_frame

Originally committed as revision 15231 to svn://svn.ffmpeg.org/ffmpeg/trunk

dbfb0e5f 09/06/2008 11:43 PM Aurelien Jacobs

matroskadec: remove useless braces

Originally committed as revision 15230 to svn://svn.ffmpeg.org/ffmpeg/trunk

24c3da16 09/06/2008 11:39 PM Aurelien Jacobs

matroskadec: ensure that the timecode added to the index are is the one
of the actual keyframe block, and not the one of the start of the cluster
containing this block.

Originally committed as revision 15229 to svn://svn.ffmpeg.org/ffmpeg/trunk

3eb9bfbb 09/04/2008 11:26 PM Aurelien Jacobs

matroskadec: fix ASS subtitle track packets before emitting them
Matroska does some butchering when storing the ASS lines. The start and end
time are removed (because they are duplicated in the container).
The matroska_fix_ass_packet() function simply restore those start and end...

62c24705 09/04/2008 11:08 PM Aurelien Jacobs

matroska: subtitle display duration must be stored in pkt->convergence_duration

Originally committed as revision 15206 to svn://svn.ffmpeg.org/ffmpeg/trunk

0dbddda3 08/27/2008 07:58 PM Aurelien Jacobs

matroskadec: cosmetics: indentation

Originally committed as revision 14995 to svn://svn.ffmpeg.org/ffmpeg/trunk

6bef5f9b 08/27/2008 07:57 PM Aurelien Jacobs

matroskadec: seek to the last position known in the index before resorting to
full cluster parsing when seeking after the end of index

Originally committed as revision 14994 to svn://svn.ffmpeg.org/ffmpeg/trunk

8e44312d 08/26/2008 08:32 PM Aurelien Jacobs

matroskadec: index timestamps are supposed to be in the timebase of the stream

Originally committed as revision 14984 to svn://svn.ffmpeg.org/ffmpeg/trunk

244ee48a 08/25/2008 12:17 AM Aurelien Jacobs

matroskadec: unset matroska->done when seeking
just in case someone try to seek back after reaching the end of file

Originally committed as revision 14960 to svn://svn.ffmpeg.org/ffmpeg/trunk

0f646a22 08/25/2008 12:15 AM Aurelien Jacobs

matroskadec: full seeking support in index-less files
when trying to seek past the last index entry, just parse more clusters to add them to the index, until an index entry match the desired position

Originally committed as revision 14959 to svn://svn.ffmpeg.org/ffmpeg/trunk

8bc98ba9 08/25/2008 12:09 AM Aurelien Jacobs

matroskadec: on the fly index construction for index-less files
each cluster that is read and that contains a video key frame is added
to the index

Originally committed as revision 14957 to svn://svn.ffmpeg.org/ffmpeg/trunk

dfbbbdc0 08/24/2008 11:57 PM Aurelien Jacobs

matroskadec: don't try to seek to negative timestamp
matroska timestamps are unsigned

Originally committed as revision 14956 to svn://svn.ffmpeg.org/ffmpeg/trunk

653fb2f8 08/24/2008 11:54 PM Aurelien Jacobs

matroskadec: move setting of matroska->done inside matroska_parse_cluster()

Originally committed as revision 14955 to svn://svn.ffmpeg.org/ffmpeg/trunk

7b571fd7 08/24/2008 05:19 PM Reimar Döffinger

Mark "matroska" probe data string constant.

Originally committed as revision 14949 to svn://svn.ffmpeg.org/ffmpeg/trunk

ba18b99f 08/24/2008 01:12 PM Aurelien Jacobs

matroskadec: make aac_profiles array const

Originally committed as revision 14943 to svn://svn.ffmpeg.org/ffmpeg/trunk

59729451 08/23/2008 11:43 PM Aurelien Jacobs

convert every muxer/demuxer to write/read sample_aspect_ratio from/to
the corresponding AVStream instead of AVCodecContext

Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk

28f27e0c 08/20/2008 11:08 PM Aurelien Jacobs

matroskadec: fail cleanly when the required compression lib is not compiled in

Originally committed as revision 14870 to svn://svn.ffmpeg.org/ffmpeg/trunk

dc3e0211 08/20/2008 10:30 PM Aurelien Jacobs

matroskadec: stop parsing when skipping en element crossing over the end of file

Originally committed as revision 14869 to svn://svn.ffmpeg.org/ffmpeg/trunk

eb9cf50a 08/20/2008 12:49 AM Aurelien Jacobs

matroska: add support for most variants of PCM

Originally committed as revision 14862 to svn://svn.ffmpeg.org/ffmpeg/trunk

b49d17b7 08/20/2008 12:44 AM Aurelien Jacobs

matroskadec: handle EBML_ID_VOID and EBML_ID_CRC32 in a generic way

Originally committed as revision 14861 to svn://svn.ffmpeg.org/ffmpeg/trunk

5df3cc6f 08/13/2008 09:15 PM Aurelien Jacobs

matroskadec: list some more ebml IDs found in the wild and that we ignore
This avoid printing some warnings about unknow IDs while we in fact know
the IDs but just want to knowingly ignore them.

Originally committed as revision 14738 to svn://svn.ffmpeg.org/ffmpeg/trunk

131f1cb2 08/13/2008 09:36 AM Aurelien Jacobs

matroskadec: parse available blocks even when cluster parsing failed
This way, we still read the few complete blocks out of a truncated
cluster at the end of a truncated file.

Originally committed as revision 14723 to svn://svn.ffmpeg.org/ffmpeg/trunk

44015c56 08/08/2008 11:50 PM Aurelien Jacobs

matroskadec: add basic tags support (metadata)

Originally committed as revision 14672 to svn://svn.ffmpeg.org/ffmpeg/trunk

00a3431c 08/06/2008 12:21 AM Aurelien Jacobs

matroskadec: use av_freep(&x) instead of av_free(x);x=NULL

Originally committed as revision 14633 to svn://svn.ffmpeg.org/ffmpeg/trunk

b8702539 08/06/2008 12:17 AM Anton Khirnov

matroskadec: replace matroska_queue_packet with a single call to dynarray_add
patch by Anton Khirnov wyskas at gmail dot com

Originally committed as revision 14632 to svn://svn.ffmpeg.org/ffmpeg/trunk

5968d2dd 08/05/2008 08:28 AM Diego Biurrun

misc spelling/grammar fixes

Originally committed as revision 14616 to svn://svn.ffmpeg.org/ffmpeg/trunk

cc70d14b 08/05/2008 12:43 AM Aurelien Jacobs

matroskadec: remove useless num_streams

Originally committed as revision 14611 to svn://svn.ffmpeg.org/ffmpeg/trunk

88cca989 08/05/2008 12:42 AM Aurelien Jacobs

matroskadec: expand useless ebml_read_element_id() wrapper

Originally committed as revision 14610 to svn://svn.ffmpeg.org/ffmpeg/trunk

33ac07ea 08/05/2008 12:42 AM Aurelien Jacobs

matroskadec: simplify matroska_ebmlnum_sint()

Originally committed as revision 14609 to svn://svn.ffmpeg.org/ffmpeg/trunk

c1e01133 08/05/2008 12:42 AM Aurelien Jacobs

matroskadec: implement matroska_ebmlnum_uint() using ebml_read_num()

Originally committed as revision 14608 to svn://svn.ffmpeg.org/ffmpeg/trunk

cc8be506 08/05/2008 12:42 AM Aurelien Jacobs

matroska: expand useless define for MS compat codec id strings

Originally committed as revision 14607 to svn://svn.ffmpeg.org/ffmpeg/trunk

ff33c5c5 08/05/2008 12:42 AM Aurelien Jacobs

matroskadec: update copyright year and related comments

Originally committed as revision 14605 to svn://svn.ffmpeg.org/ffmpeg/trunk

737c40da 08/05/2008 12:42 AM Aurelien Jacobs

matroskadec: reorder some functions in a more logical order

Originally committed as revision 14604 to svn://svn.ffmpeg.org/ffmpeg/trunk

1b6d23bb 08/05/2008 12:42 AM Aurelien Jacobs

matroskadec: remove now useless wrapper ebml_read_element_length()

Originally committed as revision 14603 to svn://svn.ffmpeg.org/ffmpeg/trunk

66cfc385 08/05/2008 12:42 AM Aurelien Jacobs

matroskadec: remove now useless wrapper ebml_read_seek()

Originally committed as revision 14602 to svn://svn.ffmpeg.org/ffmpeg/trunk