summaryrefslogtreecommitdiff
path: root/libavformat/id3v1.h
Commit message (Collapse)AuthorAgeFilesLines
* libavformat: fix spelling in ID3v1 genres and extend the list of Winamp ↵Ulrich Spörlein2020-01-051-1/+1
| | | | | | | | | | | | | | | extensions. Sources include various lists on the Internet, as well as the current Wikipedia page at https://en.wikipedia.org/w/index.php?title=List_of_ID3v1_Genres&oldid=896774343 but most importantly the list as used by taglib at https://github.com/taglib/taglib/commit/3e60e339a4bc46e2a1a7aea782502480561a8acf#diff-f86455366624350770f41b4940925dde Further patches to harmonize the spelling have been sent to taglib and libid3tag. See also https://github.com/taglib/taglib/pull/942/ Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-291-1/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: aacenc: Fix LONG_START windowing. aacenc: Fix a bug where deinterleaved samples were stored in the wrong place. avplay: use the correct array size for stride. lavc: extend doxy for avcodec_alloc_context3(). APIchanges: mention avcodec_alloc_context()/2/3 avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS. aacsbr: ARM NEON optimised sbrdsp functions aacsbr: align some arrays aacsbr: move some simdable loops to function pointers cosmetics: Remove extra newlines at EOF Conflicts: libavcodec/utils.c libavfilter/formats.c libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Remove extra newlines at EOFAlex Converse2012-01-271-1/+0
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* More ID3v1 genres from ffmbc.Michael Niedermayer2009-12-131-1/+1
| | | | 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/+7
| | | | | | patch by Patrick Dehne, patrick mysonicweb com Originally committed as revision 19224 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/+35
patch by Patrick Dehne, patrick mysonicweb com Originally committed as revision 19155 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status