5968d2dd1e
misc spelling/grammar fixes
...
Originally committed as revision 14616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 08:28:57 +00:00
cc70d14b3d
matroskadec: remove useless num_streams
...
Originally committed as revision 14611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:43:01 +00:00
88cca98947
matroskadec: expand useless ebml_read_element_id() wrapper
...
Originally committed as revision 14610 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:58 +00:00
33ac07ea08
matroskadec: simplify matroska_ebmlnum_sint()
...
Originally committed as revision 14609 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:55 +00:00
c1e01133f6
matroskadec: implement matroska_ebmlnum_uint() using ebml_read_num()
...
Originally committed as revision 14608 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:52 +00:00
cc8be50637
matroska: expand useless define for MS compat codec id strings
...
Originally committed as revision 14607 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:49 +00:00
ff33c5c565
matroskadec: update copyright year and related comments
...
Originally committed as revision 14605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:43 +00:00
737c40da20
matroskadec: reorder some functions in a more logical order
...
Originally committed as revision 14604 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:39 +00:00
1b6d23bbcb
matroskadec: remove now useless wrapper ebml_read_element_length()
...
Originally committed as revision 14603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:36 +00:00
66cfc3856c
matroskadec: remove now useless wrapper ebml_read_seek()
...
Originally committed as revision 14602 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:33 +00:00
5c5373cea4
matroskadec: remove now useless peek_id
...
Originally committed as revision 14601 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:29 +00:00
3879763833
matroskadec: don't try to re-read already parsed ID in matroska_parse_cluster()
...
Originally committed as revision 14600 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:26 +00:00
6314cca006
matroskadec: remove now unused parameter 'once' from ebml_parse_nest()
...
Originally committed as revision 14599 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:23 +00:00
c4d3d9ba95
matroskadec: directly use ebml_parse() or ebml_parse_id() where it's enough
...
Originally committed as revision 14598 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:20 +00:00
66a37e060b
matroskadec: new ebml_parse() function, centralize ebml_read_element_id() calls
...
Originally committed as revision 14597 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:17 +00:00
9bcb92ca6b
matroskadec: rename ebml_parse() to ebml_parse_nest()
...
Originally committed as revision 14596 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:13 +00:00
c005b3f224
matroskadec: don't care about the number of bytes read by ebml_read_element_id()
...
Originally committed as revision 14595 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:10 +00:00
592110c26c
matroskadec: simplify check for hierarchy level
...
Originally committed as revision 14594 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:08 +00:00
f7b9687cbb
matroskadec: cosmetics: consistent style for function declarations
...
Originally committed as revision 14593 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:05 +00:00
104be2404e
matroskadec: Use string instead of char table as probe data comparison source.
...
Originally committed as revision 14592 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:02 +00:00
eb05caccf2
matroskadec: use an EbmlBin as parameter to ebml_read_binary()
...
Originally committed as revision 14591 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:59 +00:00
c6cd2b3d22
matroskadec: extract common code out of ebml_read_*()
...
Originally committed as revision 14590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:55 +00:00
ba5a1f99cc
matroskadec: simplify/cleanup error logging in ebml_read_*()
...
Originally committed as revision 14589 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:52 +00:00
54d8869d3a
matroskadec: remove now useless expected_id parameter from ebml_parse()
...
Originally committed as revision 14588 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:50 +00:00
4dc9e183dd
matroskadec: expand useless ebml_peek_id() wrapper
...
Originally committed as revision 14587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:46 +00:00
3856e7c4aa
matroskadec: remove unused levelup parameter from ebml_read_element_id()
...
Originally committed as revision 14586 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:43 +00:00
44cea7651b
matroskadec: extract read_level_up out of ebml_read_element_id
...
Originally committed as revision 14585 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:40 +00:00
dfde36a33e
matroskadec: remove useless levelup check
...
Originally committed as revision 14584 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:37 +00:00
051ef5cef5
matroskadec: remove useless check for cluster presence
...
Originally committed as revision 14583 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:34 +00:00
28ba69e097
matroskadec: cosmetics: placement of 'else if'
...
Originally committed as revision 14582 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:31 +00:00
7eb9b068eb
matroskadec: remove some useless empty lines
...
Originally committed as revision 14581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:28 +00:00
5efc8ec850
matroskadec: remove some useless or out of date comments
...
Originally committed as revision 14580 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:25 +00:00
8f35a2c022
matroskadec: cosmetics
...
Originally committed as revision 14579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:22 +00:00
c171af9bd7
matroskadec: remove unused struct name
...
Originally committed as revision 14578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:19 +00:00
1e49ee4270
matroskadec: remove now unused context fields
...
Originally committed as revision 14577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:16 +00:00
70109c0d48
matroskadec: remove useless initialization
...
Originally committed as revision 14576 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:13 +00:00
16f97ab050
matroskadec: cosmetics: remove useless braces
...
Originally committed as revision 14575 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:10 +00:00
3143f13345
matroskadec: remove some unused ebml funcs
...
Originally committed as revision 14574 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:07 +00:00
209472b45d
matroskadec: use generic parser to parse clusters
...
Originally committed as revision 14573 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:05 +00:00
f06a488647
matroskadec: use generic parser inside matroska_execute_seekhead()
...
Originally committed as revision 14572 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:01 +00:00
ce6f28bd35
matroskadec: use generic parser to parse matroska from toplevel
...
Originally committed as revision 14571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:58 +00:00
9c25bafacb
matroskadec: move context settings to matroska_read_header()
...
Originally committed as revision 14570 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:55 +00:00
d88d806bd1
matroskadec: cosmetics: indentation of matroska_read_header()
...
Originally committed as revision 14569 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:52 +00:00
9a9a3b03a6
matroskadec: move declaration to upper block
...
Originally committed as revision 14568 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:49 +00:00
a636a56bf4
matroskadec: invert a test
...
Originally committed as revision 14567 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:46 +00:00
4348571b1a
matroskadec: cosmetics: indentation of matroska_execute_seekhead()
...
Originally committed as revision 14566 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:43 +00:00
82113343a7
matroskadec: remove useless dummy_level variable
...
Originally committed as revision 14565 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:40 +00:00
13b350a3a4
matroskadec: use generic parser to parse seekhead
...
Originally committed as revision 14564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:36 +00:00
8ecdab8f5a
matroskadec: declare var where it's used
...
Originally committed as revision 14563 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:33 +00:00
2cbc8811ab
matroskadec: use generic parser to parse tracks
...
Originally committed as revision 14562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:31 +00:00
29708581fc
matroskadec: use generic parser to parse info
...
Originally committed as revision 14561 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:27 +00:00
b414cb892e
matroskadec: use generic parser to parse attachments
...
Originally committed as revision 14560 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:24 +00:00
6bbd7c7b79
matroskadec: use generic parser to parse chapters
...
Originally committed as revision 14559 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:21 +00:00
434d496a8a
matroskadec: use generic parser to parse tags
...
Originally committed as revision 14558 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:18 +00:00
e5929fdf62
matroskadec: use generic parser to parse index
...
Originally committed as revision 14557 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:15 +00:00
009ecd504e
matroskadec: return pointer instead of index in matroska_find_track_by_num()
...
Originally committed as revision 14556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:12 +00:00
28f450a992
matroskadec: create new AVStream earlier
...
Originally committed as revision 14555 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:09 +00:00
fc4d335f6d
matroskadec: store an AVStream pointer instead of a stream index
...
Originally committed as revision 14554 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:06 +00:00
6351132435
matroskadec: use generic ebml parser to parse ebml header
...
Originally committed as revision 14553 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:02 +00:00
789ed100d7
matroskadec: add an ebml generic parser
...
Originally committed as revision 14552 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:00 +00:00
6e35ae2a74
matroskadec: remove unused is_bframe flag
...
Originally committed as revision 14551 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:39:55 +00:00
4eff97439b
matroskadec: simplify flag default
...
Originally committed as revision 14550 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:39:53 +00:00
ead3006257
matroskadec: remove storage of various unused flags
...
Originally committed as revision 14549 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:39:50 +00:00
5f8e022701
matroskadec: use more robust av_strlcpy() instead of strcpy()
...
Originally committed as revision 14548 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:39:47 +00:00
f009e36f75
matroska: add support for V_QUICKTIME track type
...
Originally committed as revision 14429 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 15:11:04 +00:00
5e8477b011
matroskadec: decode track private data if needed
...
original patch by Evgeniy Stepanov eugeni.stepanov _at_ gmail _dot_ com
Originally committed as revision 13892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 15:52:28 +00:00
935ec5a1d5
matroskadec: move buffer decoding code to a separate function
...
original patch by Evgeniy Stepanov eugeni.stepanov _at_ gmail.com
Originally committed as revision 13891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 15:49:44 +00:00
51e1cc16d3
matroskadec: fix a memory leak
...
Originally committed as revision 13890 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 15:46:36 +00:00
ded4241bb0
matroskadec: remove some useless code
...
Originally committed as revision 13783 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-16 23:11:02 +00:00
de6a9a2673
matroskadec: set cur_dts after seek
...
patch by elupus elupus _at_ ecce _dot_ se
Originally committed as revision 13748 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 19:54:17 +00:00
03b9d94e86
matroskadec: remove some useless code
...
Originally committed as revision 13659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-04 23:24:55 +00:00
e9b56825be
cosmetics: indentation
...
Originally committed as revision 13658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-04 23:15:08 +00:00
fc4738ae96
matroskadec: don't remove dummy level when none was added
...
Originally committed as revision 13657 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-04 23:11:47 +00:00
bde15e74de
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
...
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me
Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 16:20:54 +00:00
401cdd519c
adjust comment to reality
...
Originally committed as revision 13647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 15:14:21 +00:00
94f6c011d6
matroskadec: sane default value for track->time_scale
...
Originally committed as revision 13646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 15:09:30 +00:00
ff2c222c37
matroskadec: fix potential mem leak
...
may or may not fix CID134 and CID135
Originally committed as revision 13636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 23:37:14 +00:00
34ae40971b
matroskadec: avoid potential mem leak
...
fix CID120
Originally committed as revision 13635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 23:27:14 +00:00
fe53fa253f
reorganize matroska_add_stream() to fix potential mem leak and buffer overflow
...
fix CID44
Originally committed as revision 13634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 23:07:41 +00:00
4b3dc529f5
matroskadec: move ARRAY_SIZE() macro at top of the file
...
Originally committed as revision 13633 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 23:01:14 +00:00
934b910ba0
matroskadec: use the proper timestamp scaling for index entries
...
Originally committed as revision 13602 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-01 14:41:53 +00:00
7ff9708585
matroskadec: read TrackTimecodeScale and set timebase accordingly
...
patch by Anton Khirnov wyskas _at_ gmail _dot_ com
Originally committed as revision 13601 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-01 13:54:11 +00:00
cdae8eec10
matroskadec: silently discard some element ID that we don't care about
...
patch by Anton Khirnov wyskas _at_ gmail _dot_ com
Originally committed as revision 13600 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-01 13:39:54 +00:00
9bf8b5621a
Dead code removal, fixes CID59 RUN2.
...
Originally committed as revision 13509 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 21:22:08 +00:00
abd2256dbe
Pass time_base as argument to new_chapter() as well.
...
This fixes the wrong timebase the matroska demuxer had after my previous commits.
Maybe we should reduce new_chapter() to just (AVFormatContext, int id) ?
Originally committed as revision 13266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 18:15:13 +00:00
5c37f43a0d
Make ff_new_chapter() return AVChapter instead of int so its consistant with
...
av_new_program() and its simpler to set other fields in AVChapter which arent
set by ff_new_chapter().
Originally committed as revision 13262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 13:14:11 +00:00
7a2a3e8e40
Add id to AVChapter, untested (where do i find matroska files with chapters?).
...
Originally committed as revision 13255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 13:02:27 +00:00
30897e764a
don't set a dummy chapter title when title is unknown
...
Originally committed as revision 13249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 11:47:11 +00:00
ad9d62ef22
matroskadec: allows inserting chapters with unspecified end
...
Originally committed as revision 13242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-22 23:04:02 +00:00
f5275b3ce7
demux chapters out of matroska
...
patch by Anton Khirnov wyskas _at_ gmail _dot_ com
Originally committed as revision 13241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-22 22:07:09 +00:00
54dddf095c
matroskadec: add support for bzlib compressed tracks
...
Originally committed as revision 13177 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-15 23:12:41 +00:00
2f79b4e8af
add missing \n in av_log message
...
Originally committed as revision 13152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-13 23:33:15 +00:00
fbb878ce0f
matroskadec: add support for zlib compressed tracks
...
Originally committed as revision 13151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-13 23:32:13 +00:00
e3227b3f25
Add MATROSKA_TRACK_TYPE_NONE.
...
Fixes icc warning #188 : enumerated type mixed with another type
Originally committed as revision 13143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-13 15:42:27 +00:00
245976da2a
Use full path for #includes from another directory.
...
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
b9a7da77ec
use enum type instead of int
...
Originally committed as revision 13089 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 01:59:33 +00:00
db26212676
cosmetics: indentation
...
Originally committed as revision 13088 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 01:54:35 +00:00
de3230fb96
matroskadec: add support for lzo compressed tracks
...
Originally committed as revision 13087 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 01:53:59 +00:00
5d2b12f6de
matroskadec: fail gracefully when seeking don't work
...
Originally committed as revision 13085 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-08 23:11:13 +00:00
53a1e82bd2
matroskadec: add support for track content encoding
...
Only the header strip method is supported for now.
Originally committed as revision 13082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-08 21:47:31 +00:00
Diego Biurrun
Aurelien Jacobs
Evgeniy Stepanov
Joakim Plate
Stefano Sabatini
Anton Khirnov
Michael Niedermayer
Carl Eugen Hoyos