Stefano Sabatini
64be0d1eda
id3v2: prevent unsigned integer overflow in ff_id3v2_parse()
...
In ff_id3v2_parse(), prevent unsigned integer overflow if data length
indicator is skipped and tlen is < 4.
Fix crash decoding file Allaby_cut.mp3, fix trac issue #182 .
14 years ago
Stefano Sabatini
b69e5ee902
id3v2: add @file doxy and link to format documentation
14 years ago
Anton Khirnov
c5f4c0fd5c
id3v2: skip broken tags with invalid size
...
fixes issue2649.
14 years ago
Anton Khirnov
1885488757
id3v2: don't explicitly skip padding
...
It's pointless, since there's a seek to the end of tag later.
14 years ago
Anton Khirnov
eb1e7f78ea
id3v2: simplify error handling.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
bca6dee386
id3v2: explicitly seek to the end of the tag after reading
...
Current code might stop in the middle of an invalid tag.
fixes issue2650
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Anton Khirnov
45a8a02a41
lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
56e2ac6b45
id3v2: merge TYER/TDAT/TIME to date tag
14 years ago
Anton Khirnov
ffb0304593
id3v2: fix typo in error message
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit fb61a7c534
)
14 years ago
Anton Khirnov
fb61a7c534
id3v2: fix typo in error message
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Carl Eugen Hoyos
ac533ac458
Do not loop endlessly if id3v2 tag size is negative / too large.
...
Fixes the sample from issue 2649.
14 years ago
Anton Khirnov
384c9c2fa7
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712
)
14 years ago
Anton Khirnov
a2704c9712
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
74b3f67c9c
lavf: replace all uses of url_fskip with avio_seek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e356fc57a2
)
14 years ago
Anton Khirnov
f59d8ff8cd
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b4aa5dac8
)
14 years ago
Anton Khirnov
e356fc57a2
lavf: replace all uses of url_fskip with avio_seek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
6b4aa5dac8
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
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
)
14 years ago
Anton Khirnov
b7effd4e83
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>
14 years ago
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
)
14 years ago
Anton Khirnov
471fe57e1a
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd
)
14 years ago
Anton Khirnov
e731b8d872
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>
14 years ago
Anton Khirnov
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
fe01dd8d74
id3v2: split tables for various ID3v2 versions
...
This is needed for upcoming ID3v2.3 muxing support.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit cb6bc57681
)
14 years ago
Anton Khirnov
cb6bc57681
id3v2: split tables for various ID3v2 versions
...
This is needed for upcoming ID3v2.3 muxing support.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
14 years ago
Anton Khirnov
eeb0b893e3
id3v2: use an enum for encodings instead of magic numbers.
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d66eff3685
)
14 years ago
Anton Khirnov
d4cc1f5b97
id3v2: don't overwrite existing tags
...
Apparently some broken taggers prepend a new ID3v2 tag leaving the
existing one intact. Our parser currently reads all tags and overwrites
existing values with supposedly outdated ones.
fixes issue2419
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 75aded8328
)
14 years ago
Anton Khirnov
189665d927
id3v2: convert metadata after all the tags were read
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f7fcd6a254
)
14 years ago
Anton Khirnov
b3158f7a42
id3v2: make ff_id3v2_parse static
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 46a2da7698
)
14 years ago
Anton Khirnov
d66eff3685
id3v2: use an enum for encodings instead of magic numbers.
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Anton Khirnov
75aded8328
id3v2: don't overwrite existing tags
...
Apparently some broken taggers prepend a new ID3v2 tag leaving the
existing one intact. Our parser currently reads all tags and overwrites
existing values with supposedly outdated ones.
fixes issue2419
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Anton Khirnov
f7fcd6a254
id3v2: convert metadata after all the tags were read
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Anton Khirnov
46a2da7698
id3v2: make ff_id3v2_parse static
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Anton Khirnov
a152c77f26
id3v2: skip data length indicator
...
Originally committed as revision 25926 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Anton Khirnov
407d3d5a3a
id3v2: skip encrypted/compressed frames
...
Originally committed as revision 25903 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Anton Khirnov
7a07d158bd
id3v2: use a named constant instead of 0x02
...
Originally committed as revision 25902 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Anton Khirnov
bcb5d217ba
id3v2: add TDEN<->creation_time tag mapping
...
Originally committed as revision 25812 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
27af8902c4
Fix indentation of ff_id3v2_read
...
Originally committed as revision 25292 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
David Byron
0c41d554e2
Read all id3v2 tags at the beginning of mp3 files.
...
Patch by David Byron, dbyron dbyron com
Originally committed as revision 25105 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Alexander Kojevnikov
18bbe9df9a
Support unsynchronisation for id3v2 tags.
...
Patch by Alexander Kojevnikov, alexander kojevnikov com
Originally committed as revision 24824 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Alexander Kojevnikov
ff58de29f1
Skip short padding in id3v2.
...
Patch by Alexander Kojevnikov, alexander kojevnikov com
Originally committed as revision 24567 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Karcher
3a1350e8d9
Generalize ID3v2 functions to support ID3v2-like ID headers with a
...
different magic in the header (mainly targeted to Sony's .oma/.aa3
format).
Patch by Michael Karcher, ffmpeg A mkarcher dialup fu-berlin de
Originally committed as revision 23583 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
Jai Menon
037e9afd37
Fix off-by-1 error in the tag parsing code.
...
Originally committed as revision 22945 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
Michael Niedermayer
dfe9ee6b95
More entries for ff_id3v2_metadata_conv from ffmbc.
...
Originally committed as revision 20839 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
8a98be1a08
s/author/artist/ for ID3
...
from ffmbc
Originally committed as revision 20838 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago