1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

86 Commits

Author SHA1 Message Date
Patrick Dehne
50fcd5be36 Move id3v1/id3v2 handling code from mp3.c to id3v[12].c.
patch by Patrick Dehne, patrick mysonicweb com

Originally committed as revision 19224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-19 14:03:35 +00:00
Patrick Dehne
7541118286 Move id3v2 parsing code from mp3.c to id3v2.h and id3v2.c.
patch by Patrick Dehne, patrick mysonicweb com

Originally committed as revision 19155 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 15:26:57 +00:00
Michael Niedermayer
f9f2ab8229 Require 4 instead of 3 frames for detecting mp3,
fixes misdetection of mpegps_mp3_unrecognized_format.mpg (issue997)

Originally committed as revision 18657 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-22 02:58:20 +00:00
Aurelien Jacobs
bd51c0138a handle id3v2 'genre' tag formated as '%d'
Originally committed as revision 18145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 16:10:37 +00:00
Diego Biurrun
0ffbc258aa Change a bunch of codec long_names to be more consistent and descriptive.
Originally committed as revision 17716 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-02 05:18:33 +00:00
Alex Converse
d0f89acf60 Make the MP3 probe weakly claim all files with ID3v2 tags to fix regressions on
files with very large tags.

Originally committed as revision 17008 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 18:41:06 +00:00
Aurelien Jacobs
b3a9e50c10 cosmetics: indentation
Originally committed as revision 16957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 22:17:26 +00:00
Aurelien Jacobs
3b1c4a06f6 simplify usage of dstlen as it is not a parameter anymore
Originally committed as revision 16956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 22:17:14 +00:00
Aurelien Jacobs
ee56cab3f3 cosmetics: indentation
Originally committed as revision 16955 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 22:14:28 +00:00
Aurelien Jacobs
b182eeb08b use new metadata API in the mp3 muxer
Originally committed as revision 16954 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 22:13:03 +00:00
Aurelien Jacobs
9d98535ceb use new metadata API in the mp3 demuxer
Originally committed as revision 16953 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 22:11:56 +00:00
Aurelien Jacobs
9f5aca8fec don't support the mp3 extension in the mp2 muxer
especially not under any conditionnal

Originally committed as revision 16922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 21:22:12 +00:00
Andreas Öman
cf92cec7d8 Avoid allocating MPADecodeContext on stack.
Instead move relevant fields into MPADecodeHeader and use it
where appropriate.

Originally committed as revision 16728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 12:09:32 +00:00
Alex Converse
38cef58404 Fix a read past end of buffer crash in the mp3 probe
Originally committed as revision 16693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 08:00:39 +00:00
Alex Converse
ac3ef4a41b Fix probing of files with ID3v2 tags. Discussed at
http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2009-January/059302.html

Originally committed as revision 16688 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 21:54:06 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences.
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
Alex Converse
2ea512a6c2 Factorise id3v2 header parsing from mp3.c to be shared
Patch by Alex Converse ( alex converse gmail com )

Originally committed as revision 16615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-15 12:23:03 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
Yoav Steinberg
853a97530e If we find a VBR tag at the beginning of the file don't attempt to
parse it as a valid frame.
patch by (Yoav Steinberg yoav out monfort in co in il)

Originally committed as revision 16421 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-04 16:23:18 +00:00
Michael Niedermayer
c96bd21227 Change mpeg audio parser so it only sets frame_size, channels and bit_rate
after it has a few valid frames.
Fixes issue762

Originally committed as revision 16259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-21 23:50:16 +00:00
Diego Biurrun
bc5c918ea8 Remove offset_t typedef and use int64_t directly instead.
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.

Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-03 10:16:29 +00:00
Diego Biurrun
8212568a1c Replace generic CONFIG_MUXERS preprocessor conditionals by more specific
CONFIG_FOO_MUXER conditionals where appropriate.

Originally committed as revision 15158 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 22:45:13 +00:00
Reimar Döffinger
1bef65f4fe Make the id3v1_genre_str array const, not just the strings it points to.
Originally committed as revision 14942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 12:45:15 +00:00
Aurelien Jacobs
ea452b54f0 strcasecmp() requires #include <strings.h>
Originally committed as revision 14728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 17:22:53 +00:00
Diego Biurrun
58607ca7d2 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
Originally committed as revision 14164 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-11 07:41:11 +00:00
Michael Niedermayer
0328995893 All mp3 parsers are buggy fix 2 of n (out of array write, i suspect not exploitable)
Originally committed as revision 14070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-04 22:04:41 +00:00
Michael Niedermayer
d5ae45841f All id3 parsers are buggy, 0 termination fix 1 of n (issue created by andreas
and found by reimar) fix is from reimar + cosmetics by me.

Originally committed as revision 14069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-04 22:00:35 +00:00
Baptiste Coudurier
9b64a036c0 remove useless close funcs
Originally committed as revision 13835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 23:25:04 +00:00
Stefano Sabatini
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
Carl Eugen Hoyos
d9133126d3 Replace some occurrences of 0 with CODEC_ID_NONE.
Fixes icc warning #188: enumerated type mixed with another type

Originally committed as revision 13135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-12 10:30:40 +00:00
Diego Biurrun
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
Diego Biurrun
ccd425e799 Remove unnecessary parentheses from return calls.
Originally committed as revision 13069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-06 09:16:36 +00:00
Michael Niedermayer
8df94c73dc Another const found by -Wwrite-strings.
Originally committed as revision 11847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 01:01:52 +00:00
Michael Niedermayer
2db971135a return a slightly larger score if we find more than 500 valid mp3 frames in a row
Originally committed as revision 11148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03 09:26:44 +00:00
Michael Niedermayer
5ef5501b71 ensure that the probe code runs in O(n)
Originally committed as revision 11147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03 08:27:04 +00:00
Michael Niedermayer
890d2799c1 remove arbitrary 4096 limit for probing
Originally committed as revision 11145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03 04:50:01 +00:00
Michael Niedermayer
5110d151b6 prevent O(n^2) execution of ff_mpa_decode_header() for valid mp3 files
Originally committed as revision 11144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03 04:49:01 +00:00
Björn Axelsson
899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-21 07:41:00 +00:00
Aurelien Jacobs
d638424b8a cosmetics: whitespace
Originally committed as revision 11028 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-14 20:31:56 +00:00
Andreas Öman
bd59786204 remove unnecessary -1 from snprintf len
Originally committed as revision 11009 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-14 06:33:35 +00:00
Patrice Bensoussan
bd548b99aa Add support for ID3v2 year tag
Patch by: patrice bensoussan a free d fr

Originally committed as revision 11008 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-14 06:32:55 +00:00
Andreas Öman
5b5bd7c9ee make sure the mpeg audio header is valid before passing it to ff_mpegaudio_decode_header()
Originally committed as revision 10925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-04 19:52:08 +00:00
Andreas Öman
8862fb41e0 add support for reading duration from VBRI-tag in mp3 files
Originally committed as revision 10851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-24 04:56:22 +00:00
Andreas Öman
478638abad fix indent
Originally committed as revision 10847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-23 17:28:30 +00:00
Andreas Öman
db233e832f cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
Originally committed as revision 10846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-23 17:10:41 +00:00
Andreas Öman
ca851a3a08 add support for reading duration from Xing-tag in mp3 files
Originally committed as revision 10845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-23 13:35:20 +00:00
Thorsten Jordan
f97931c122 set start_time to 0 to enable seeking in mp3-files
patch by Thorsten Jordan, tjordan macrosystem de

Originally committed as revision 10780 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 15:02:34 +00:00
Baptiste Coudurier
c6377f6143 do not write id3v2 header when writing .mp2 files
Originally committed as revision 9924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-05 00:47:57 +00:00
Panagiotis Issaris
6f3e0b2174 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
Originally committed as revision 9760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-19 15:23:32 +00:00
Panagiotis Issaris
769e10f068 Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
Originally committed as revision 9759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-19 15:21:30 +00:00