summaryrefslogtreecommitdiffstats
path: root/libavformat/id3v1.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-091-3/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: crypto: Use av_freep instead of av_free lavf: don't try to free private options if priv_data is NULL. swscale: fix types of assembly arguments. swscale: move two macros that are only used once into caller. swscale: remove unused function. options: Add missing braces around struct initializer. mov: Remove leftover crufty debug statement with references to a local file. dvbsubdec: Fix compilation of debug code. Remove all uses of now deprecated metadata functions. Move metadata API from lavf to lavu. Conflicts: doc/APIchanges libavformat/aiffdec.c libavformat/asfdec.c libavformat/avformat.h libavformat/avidec.c libavformat/cafdec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/wtv.c libavutil/avutil.h libavutil/internal.h libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove all uses of now deprecated metadata functions.Anton Khirnov2011-06-081-3/+4
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-041-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: fix partial run when no samples path is specified ARM: NEON fixed-point forward MDCT ARM: NEON fixed-point FFT lavf: bump minor version and add an APIChanges entry for avio changes avio: simplify url_open_dyn_buf_internal by using avio_alloc_context() avio: make url_fdopen internal. avio: make url_open_dyn_packet_buf internal. avio: avio_ prefix for url_close_dyn_buf avio: avio_ prefix for url_open_dyn_buf avio: introduce an AVIOContext.seekable field ac3enc: use generic fixed-point mdct lavfi: add fade filter Change yadif to not use out of picture lines. lavc: deprecate AVCodecContext.antialias_algo lavc: mark mb_qmin/mb_qmax for removal on next major bump. Conflicts: doc/filters.texi libavcodec/ac3enc_fixed.h libavcodec/ac3enc_float.h libavfilter/Makefile libavfilter/allfilters.c libavfilter/vf_fade.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: introduce an AVIOContext.seekable fieldAnton Khirnov2011-04-031-1/+1
| | | | | | | | Use it instead of url_is_streamed and AVIOContext.is_streamed.
| * id3v1: change filesize to int64_t.Carl Eugen Hoyos2011-03-281-2/+2
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * id3v1: Seek back to old position after reading.Carl Eugen Hoyos2011-03-281-1/+2
| | | | | | | | | | | | | | | | FFmpeg did not seek back to the original position, but to "0", making reading a VBR tag impossible. (issue 2645) Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * avio: avio_ prefix for url_fsizeAnton Khirnov2011-03-071-1/+1
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefix for url_fseekAnton Khirnov2011-03-011-2/+2
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefixes for get_* functionsAnton Khirnov2011-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'ffmpeg-mt/master'Michael Niedermayer2011-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ffmpeg-mt/master: Update todo. More items appeared... Fix mdec Duplicate: id3v1: change filesize to int64_t. Duplicate: id3v1: Seek back to old position after reading. Conflicts: libavcodec/mpegvideo.c libavcodec/snow.c libavformat/id3v1.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avio: avio_ prefix for url_fsizeAnton Khirnov2011-03-081-1/+1
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 76aa876e69cf78a40821e66dec0a1006e4eb23ec)
* | Change filesize to int64_t.Carl Eugen Hoyos2011-03-071-2/+2
| |
* | Seek back to old position after reading id3v1 tag.Carl Eugen Hoyos2011-03-071-1/+2
| | | | | | | | | | | | FFmpeg did not seek back to the original position, but to "0", making reading a VBR tag impossible. (issue 2645)
* | avio: avio_ prefix for url_fseekAnton Khirnov2011-03-031-2/+2
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 6b4aa5dac8f41aa452d0ce9a1bede9e59a303060)
* | avio: avio_ prefixes for get_* functionsAnton Khirnov2011-02-221-1/+1
|/ | | | | | | | | | | | | | | 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)
* Partially revert "Simplify code by using av_metadata_set2()."Anton Khirnov2010-11-291-3/+5
| | | | | | | | This reverts snprintf->av_d2str part of r20840. With it, track number is exported as a float, which is not desirable. Originally committed as revision 25845 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Mark av_metadata_set() as deprecated, and use av_metadata_set2()Stefano Sabatini2010-04-251-2/+2
| | | | | | | | 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
* Add a list of generic tags and change demuxers to follow it.Anton Khirnov2010-02-011-1/+1
| | | | | | Patch by Anton Khirnov, wyskas at gmail dot com Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Revert Revision: 21473Michael Niedermayer2010-01-271-1/+1
| | | | | | | | | Log: Fix misc typos, patch by Fabian Greffrath base64_decode(PGZhYmlhbkBncmVmZnJhdGguY29tPg==). This violates the spec. Originally committed as revision 21478 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix misc typos, patch byStefano Sabatini2010-01-271-1/+1
| | | | | | Fabian Greffrath base64_decode(PGZhYmlhbkBncmVmZnJhdGguY29tPg==). Originally committed as revision 21473 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Correct truncated ID3v1 genre name.Alexander Strange2009-12-131-1/+1
| | | | Originally committed as revision 20843 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify code by using av_metadata_set2().Michael Niedermayer2009-12-131-5/+3
| | | | | | somewhat based on ffmbc Originally committed as revision 20840 to svn://svn.ffmpeg.org/ffmpeg/trunk
* s/author/artist/ for ID3Michael Niedermayer2009-12-131-1/+1
| | | | | | from ffmbc Originally committed as revision 20838 to svn://svn.ffmpeg.org/ffmpeg/trunk
* More ID3v1 genres from ffmbc.Michael Niedermayer2009-12-131-0/+22
| | | | Originally committed as revision 20837 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ff_id3v1_genre_str table should be const.Reimar Döffinger2009-09-061-1/+1
| | | | Originally committed as revision 19781 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move id3v1/id3v2 handling code from mp3.c to id3v[12].c.Patrick Dehne2009-06-191-0/+70
| | | | | | patch by Patrick Dehne, patrick mysonicweb com Originally committed as revision 19224 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Reformat to K&R and prettyprint newly created files.Diego Biurrun2009-06-111-100/+100
| | | | Originally committed as revision 19156 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move id3v2 parsing code from mp3.c to id3v2.h and id3v2.c.Patrick Dehne2009-06-111-0/+151
patch by Patrick Dehne, patrick mysonicweb com Originally committed as revision 19155 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud