har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,228 Commits 2 Branches 401 Tags
Commit Graph

49 Commits

Author SHA1 Message Date
Anton Khirnov
980e65f119 ape: create audio stream before reading tags. 
Tags may contain attached picture, which will be exported as video
streams.

This ensures that the audio stream is always the first.
 2012-06-24 07:55:33 +02:00
Martin Storsjö
20234a4bd7 cosmetics: Align muxer/demuxer declarations 
Also add missing trailing commas, break long codec_tag lines and
add spaces in codec_tag declarations.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-04-06 19:19:59 +03:00
Justin Ruggles
9727264220 ape: do not set AVCodecContext.frame_size. 
prevents lavf from setting incorrect packet durations.
 2012-03-05 13:08:17 -05:00
Justin Ruggles
f1c3d4a68a ape: skip packets with invalid size 2012-02-06 13:22:01 -05:00
Justin Ruggles
ac3f8d317c ape: calculate final packet size instead of guessing 
Calculates based on total file size and wavetaillength from the header.
Falls back to multiplying finalframeblocks by 8 instead of 4 so that it will
at least be overestimating for 24-bit. Currently it can underestimate the
final packet size, leading to decoding errors.
 2012-02-06 13:22:01 -05:00
Justin Ruggles
c2c316158f ape: stop reading after the last frame has been read 
This avoids buffer overread when the last packet size estimate is too small.
 2012-02-06 13:09:11 -05:00
Justin Ruggles
66f7be3603 ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished 2012-02-06 13:09:11 -05:00
Justin Ruggles
1bc035bc03 ape: return error if seeking to the current packet fails in ape_read_packet() 2012-02-06 13:09:11 -05:00
Paul B Mahol
86b57e4efe ape: fix seeking 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-04 14:32:33 -05:00
Anton Khirnov
6e9651d106 lavf: remove AVFormatParameters from AVFormatContext.read_header signature 2012-01-27 10:51:57 +01:00
Anton Khirnov
c3f9ebf743 lavf: make av_set_pts_info private. 
It's supposed to be called only from (de)muxers.
 2011-11-30 20:34:45 +01:00
Anton Khirnov
3b3bbdd3e6 lavf,lavd: replace av_new_stream->avformat_new_stream part I. 
Trivial replacements with sed are done in this commit:
sed 's/av_new_stream(\([^)]*\), 0)/avformat_new_stream(\1, NULL)/'
 2011-10-19 17:02:11 +02:00
Laurent Aimar
273aab99bf ape demuxer: fix segfault on memory allocation failure. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-12 21:12:31 +02:00
Diego Biurrun
ab3d241be1 ape: adjust some printf format strings to correctly match argument types 2011-07-26 00:34:52 +02:00
Anton Khirnov
dfc2c4d900 lavf: use designated initialisers for all (de)muxers. 
It's more readable and less prone to breakage.
 2011-07-17 06:58:37 +02:00
Diego Biurrun
f190f676bc Replace custom DEBUG preprocessor trickery by the standard one. 2011-06-03 00:44:06 +02:00
Diego Biurrun
b0a4e5f9e7 Employ correct printf format specifiers, mostly in debug output. 2011-05-31 23:45:14 +02:00
Carl Eugen Hoyos
ab088f7d28 ape: Allow demuxing of files with metadata tags. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-24 19:07:33 +02:00
Anton Khirnov
8978fedaee avio: introduce an AVIOContext.seekable field 
Use it instead of url_is_streamed and AVIOContext.is_streamed.
 2011-04-03 22:46:40 +02:00
Kostya Shishkov
29a290439b ape: check that number of seektable entries is equal to number of frames 
fixes issue2480

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-01 09:34:44 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
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>
 2011-03-16 22:24:51 -04:00
Kostya
8312e3fc90 Do not attempt to decode APE file with no frames 
This fixes invalid reads/writes with this sample:
http://packetstorm.linuxsecurity.com/1103-exploits/vlc105-dos.txt
 2011-03-16 12:53:52 +01:00
Anton Khirnov
66e5b1df36 avio: deprecate url_feof 
AVIOContext.eof_reached should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 17:20:31 -05:00
Anton Khirnov
e356fc57a2 lavf: replace all uses of url_fskip with avio_seek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:22:16 -05:00
Anton Khirnov
6b4aa5dac8 avio: avio_ prefix for url_fseek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:12:33 -05:00
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>
 2011-02-21 11:23:22 -05:00
Anton Khirnov
ae628ec1fd avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-20 08:37:15 -05:00
Diego Elio Pettenò
c6610a216e Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. 
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
 2011-01-26 22:10:09 +00:00
Stefano Sabatini
2874c81cc8 Replace all remaining occurrences of AVERROR_NOMEM with 
AVERROR(ENOMEM).

AVERROR_NOMEM is deprecated and will be dropped at the next libavutil
major bump.

Originally committed as revision 22791 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-03 14:15:00 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Stefano Sabatini
5ae092ee34 Replace all the occurrences of AVERROR_EIO with AVERROR(EIO), and mark 
AVERROR_EIO for deletion at the next major bump.

Originally committed as revision 22513 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-13 19:19:44 +00:00
David Conrad
0fc07ad951 Set start_time and duration in AVStream instead of AVFormatContext for 
formats with only one stream; the AVFormatContext values will be derived from
the AVStream and this helps in calculating stream bitrate.

Originally committed as revision 21361 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-21 09:47:02 +00:00
Kostya Shishkov
191e34cd67 Move APE tag parsing into separate module. 
Based on patch by Matti Hamalainen (mhamalai<mot>students<punkt>oamk<punkt>)

Originally committed as revision 19629 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-11 17:08:09 +00:00
Matti Hamalainen
6984380c61 Do not use internals of ByteIOContext during APE tags parsing. 
Patch by Matti Hamalainen, mail = reverse("if.kmao.stneduts@ialamahm")
Thread: [PATCH] 2/6 Fix broken APE tag key handling

Originally committed as revision 19628 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-11 16:55:49 +00:00
Matti Hamalainen
22667e40be Remove incorrect APE tag size adjustment based on flags. 
Patch by Matti Hamalainen (mhamalai <luona> students <piste> oamk <piste> fi)
Thread: [PATCH] 1/6 Remove incorrect APE tag size adjustment based on flags

Originally committed as revision 19627 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-11 16:43:44 +00:00
Aurelien Jacobs
41d7f7bdb9 apedec: display a warning when truncating a metadata tag 
Originally committed as revision 17394 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-17 15:44:11 +00:00
Aurelien Jacobs
3f9867b150 use new metadata API in ape demuxer 
Originally committed as revision 17388 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-17 00:02:13 +00:00
Benoit Fouet
76b9092f24 Add a context to av_log() calls and extend ape_dumpinfo prototype to do that. 
Originally committed as revision 17372 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-16 14:44:31 +00:00
Diego Biurrun
6a5d31ac25 Fix build: Add intreadwrite.h and bswap.h #includes where necessary. 
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 22:19:48 +00:00
Luca Abeni
dd1c8f3e6e Bump Major version, this commit is almost just renaming bits_per_sample to 
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!

Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 14:24:59 +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
Kostya Shishkov
c5497b22b7 Missing tags in APE is normal situation, so don't print an error. 
Resolves issue 437

Originally committed as revision 12977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 06:29:56 +00:00
Michael Niedermayer
8dd8dc5790 fix 8 "initialization discards qualifiers from pointer target type" 
warnings

Originally committed as revision 11845 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-04 00:42:27 +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
Kostya Shishkov
c1f3c63058 Looks like this APE decoder support versions starting from 3.95 
Originally committed as revision 10551 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-23 07:40:34 +00:00
Aurelien Jacobs
7f559eb1cd disable loads of debug messages to reduce object size 
Originally committed as revision 10518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-17 12:01:37 +00:00
Benjamin Zores
781ad2f50a monkey audio demuxer now can parse ape tags 
Originally committed as revision 10511 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-16 19:51:10 +00:00
Kostya Shishkov
bf4a1f17ee Monkey Audio decoder 
Originally committed as revision 10484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-13 03:22:47 +00:00