summaryrefslogtreecommitdiff
path: root/libavformat/id3v2.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-23
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: (33 commits) Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size. Add kbdwin.o to AC3 decoder Detect byte-swapped AC-3 and support decoding it directly. cosmetics: indentation Always copy input data for AC3 decoder. ac3enc: make sym_quant() branch-free cosmetics: indentation Add a CPU flag for the Atom processor. id3v2: skip broken tags with invalid size id3v2: don't explicitly skip padding Make sure kbhit() is in conio.h fate: update wmv8-drm reference vc1: make P-frame deblock filter bit-exact. configure: Add the -D parameter to the dlltool command amr: Set the AVFMT_GENERIC_INDEX flag amr: Set the pkt->pos field properly to the start of the packet amr: Set the codec->bit_rate field based on the last packet rtsp: Specify unicast for TCP interleaved streams, too Set the correct target for mingw64 dlltool applehttp: Change the variable for stream position in seconds into int64_t ... Conflicts: ffmpeg.c ffplay.c libavcodec/ac3dec.c libavformat/avio.h libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * id3v2: skip broken tags with invalid sizeAnton Khirnov2011-03-22
| | | | | | | | fixes issue2649.
| * id3v2: don't explicitly skip paddingAnton Khirnov2011-03-22
| | | | | | | | It's pointless, since there's a seek to the end of tag later.
| * id3v2: simplify error handling.Anton Khirnov2011-03-21
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * id3v2: explicitly seek to the end of the tag after readingAnton Khirnov2011-03-21
| | | | | | | | | | | | | | | | Current code might stop in the middle of an invalid tag. fixes issue2650 Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-17
|\| | | | | | | | | | | | | | | | | | | Conflicts: Changelog doc/APIchanges doc/optimization.txt libavformat/avio.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes senseAnton Khirnov2011-03-16
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * id3v2: merge TYER/TDAT/TIME to date tagAnton Khirnov2011-03-15
| |
| * id3v2: fix typo in error messageAnton Khirnov2011-03-09
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-04
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * lavf: replace all uses of url_fskip with avio_seekAnton Khirnov2011-03-01
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefix for url_fseekAnton Khirnov2011-03-01
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefixes for get_* functionsAnton Khirnov2011-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * avio: move init_put_byte() to a new private header and rename itAnton Khirnov2011-02-20
| | | | | | | | | | | | | | 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>
| * avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * id3v2: split tables for various ID3v2 versionsAnton Khirnov2011-01-22
| | | | | | | | | | | | This is needed for upcoming ID3v2.3 muxing support. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
| * id3v2: use an enum for encodings instead of magic numbers.Anton Khirnov2011-01-21
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * id3v2: don't overwrite existing tagsAnton Khirnov2011-01-20
| | | | | | | | | | | | | | | | | | | | 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>
| * id3v2: convert metadata after all the tags were readAnton Khirnov2011-01-20
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * id3v2: make ff_id3v2_parse staticAnton Khirnov2011-01-20
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | id3v2: fix typo in error messageAnton Khirnov2011-03-09
| | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit fb61a7c5343a23d845ab73dd28caf6ec98cd6101)
* | Do not loop endlessly if id3v2 tag size is negative / too large.Carl Eugen Hoyos2011-03-07
| | | | | | | | Fixes the sample from issue 2649.
* | avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-05
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit a2704c9712ad35cc22e7e0d8a79b581c07fa383b)
* | lavf: replace all uses of url_fskip with avio_seekAnton Khirnov2011-03-03
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit e356fc57a2e9887370caec58d8aafeafd1f336dc)
* | avio: avio_ prefix for url_fseekAnton Khirnov2011-03-03
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 6b4aa5dac8f41aa452d0ce9a1bede9e59a303060)
* | avio: avio_ prefixes for get_* functionsAnton Khirnov2011-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 b7effd4e8338f6ed5bda630ad7ed0809bf458648)
* | avio: move init_put_byte() to a new private header and rename itAnton Khirnov2011-02-20
| | | | | | | | | | | | | | | | 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 e731b8d8729e75bfb69f5540e6446d6118dac549)
* | avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
* | id3v2: split tables for various ID3v2 versionsAnton Khirnov2011-01-23
| | | | | | | | | | | | | | This is needed for upcoming ID3v2.3 muxing support. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit cb6bc57681b2ec5232e64db176f41fb2517de146)
* | id3v2: use an enum for encodings instead of magic numbers.Anton Khirnov2011-01-21
| | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit d66eff36852975129ae499c56de4340e48b9b7b4)
* | id3v2: don't overwrite existing tagsAnton Khirnov2011-01-21
| | | | | | | | | | | | | | | | | | | | | | 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 75aded8328e35c9391e25a1c857eb6e3b801a8d8)
* | id3v2: convert metadata after all the tags were readAnton Khirnov2011-01-21
| | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit f7fcd6a2549b58a69c02622503676a8b142e4c43)
* | id3v2: make ff_id3v2_parse staticAnton Khirnov2011-01-21
|/ | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 46a2da7698634214eed6d269fc72d284e3d3700f)
* id3v2: skip data length indicatorAnton Khirnov2010-12-10
| | | | Originally committed as revision 25926 to svn://svn.ffmpeg.org/ffmpeg/trunk
* id3v2: skip encrypted/compressed framesAnton Khirnov2010-12-07
| | | | Originally committed as revision 25903 to svn://svn.ffmpeg.org/ffmpeg/trunk
* id3v2: use a named constant instead of 0x02Anton Khirnov2010-12-07
| | | | Originally committed as revision 25902 to svn://svn.ffmpeg.org/ffmpeg/trunk
* id3v2: add TDEN<->creation_time tag mappingAnton Khirnov2010-11-23
| | | | Originally committed as revision 25812 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add ff_ prefix to metadata_conv()Anton Khirnov2010-10-16
| | | | | | patch by Anton Khirnov anton _at_ khirnov _dot_ net Originally committed as revision 25505 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Export metadata in the generic format. Deprecate old conversion API.Anton Khirnov2010-10-15
| | | | | | patch by Anton Khirnov anton _at_ khirnov _dot_ net Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix indentation of ff_id3v2_readReimar Döffinger2010-10-01
| | | | Originally committed as revision 25292 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Read all id3v2 tags at the beginning of mp3 files.David Byron2010-09-11
| | | | | | Patch by David Byron, dbyron dbyron com Originally committed as revision 25105 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Support unsynchronisation for id3v2 tags.Alexander Kojevnikov2010-08-18
| | | | | | Patch by Alexander Kojevnikov, alexander kojevnikov com Originally committed as revision 24824 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Skip short padding in id3v2.Alexander Kojevnikov2010-07-28
| | | | | | Patch by Alexander Kojevnikov, alexander kojevnikov com Originally committed as revision 24567 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Generalize ID3v2 functions to support ID3v2-like ID headers with aMichael Karcher2010-06-11
| | | | | | | | | 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
* Mark av_metadata_set() as deprecated, and use av_metadata_set2()Stefano Sabatini2010-04-25
| | | | | | | | 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
* Fix off-by-1 error in the tag parsing code.Jai Menon2010-04-22
| | | | Originally committed as revision 22945 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a list of generic tags and change demuxers to follow it.Anton Khirnov2010-02-01
| | | | | | Patch by Anton Khirnov, wyskas at gmail dot com Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk
* More entries for ff_id3v2_metadata_conv from ffmbc.Michael Niedermayer2009-12-13
| | | | Originally committed as revision 20839 to svn://svn.ffmpeg.org/ffmpeg/trunk
* s/author/artist/ for ID3Michael Niedermayer2009-12-13
| | | | | | from ffmbc Originally committed as revision 20838 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-31 09:06:05 +0000