ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-21 05:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,205 Commits 36 Branches 398 Tags 544 MiB
d7c11b114b
Commit Graph

78 Commits

Author SHA1 Message Date
Alex Converse
c898431ca5 nsvdec: Propagate errors 
Related to CVE-2011-3940.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
 2012-01-30 10:15:41 -08:00
Alex Converse
8fd8a48263 nsvdec: Be more careful with av_malloc(). 
Check results for av_malloc() and fix an overflow in one call.

Related to CVE-2011-3940.

Based in part on work from Michael Niedermayer.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
 2012-01-30 10:15:19 -08:00
Michael Niedermayer
6a89b41d97 nsvdec: Fix use of uninitialized streams. 
Fixes CVE-2011-3940 (Out of bounds read resulting in out of bounds write)

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5c011706bc)

Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2012-01-30 10:14:06 -08: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
Diego Biurrun
20566eb0f0 Replace outdated references to ffmpeg tool with avconv. 2011-11-02 10:42:54 +01:00
Anton Khirnov
84ad31ff18 lavf: replace av_new_stream->avformat_new_stream part II. 
Manual replacements are done in this commit.

In many cases, the id is some constant made up number (e.g. 0 for video
and 1 for audio), which is then not used in the demuxer for anything.
Those ids are removed.
 2011-10-19 17:02:11 +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
Mans Rullgard
0ebcdf5cda Do not include mathematics.h in avutil.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 21:42:06 +01:00
Diego Biurrun
35fa0d4758 nsvdec: Propagate error values instead of returning 0 in nsv_read_header(). 
This eliminates a warning about a set-but-unused variable.
 2011-06-23 13:47:16 +02:00
Diego Biurrun
919d7a345a Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog. 2011-06-10 19:12:14 +02:00
Anton Khirnov
d2d67e424f Remove all uses of now deprecated metadata functions. 2011-06-08 07:43:45 +02:00
Mans Rullgard
5e1166b31b Mark some variables with av_unused 
Most of these variables are only used in av_dlog statements, some
are required but not used by other macros.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-03 12:59:05 +01:00
Thierry Foucu
45faf7fcd3 nsv: Fix misdetection of MP3 files as NSV. 
If an MP3 file contains the string NSVs, the NSV probe will confuse it for an
NSV file. Check for 0xBEEF after a Video/Audio chunk to achieve more accuracy.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-12 11:32:39 +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
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
a2704c9712 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-04 11:26:57 -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
Maksym Veremeyenko
41cdc1ff1e fix nsvdec.c compilation if DEBUG macro defined 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-16 07:33:25 -05:00
Maksym Veremeyenko
d06497f316 fix nsvdec.c compilation if DEBUG defined 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-15 09:15:43 -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
2ef6c1242a Mark av_metadata_set() as deprecated, and use av_metadata_set2() 
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
 2010-04-25 14:27:42 +00:00
Jean-Daniel Dupas
cc947f04cc Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY. 
Patch by Jean-Daniel Dupas, devlists shadowlab org

Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 12:29:58 +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
Jai Menon
1f6d0d42c5 Plug memory leak in NSV demuxer. 
Patch by Jai Menon.

Originally committed as revision 22173 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 17:26:00 +00:00
Stefano Sabatini
ade5b91dda Use av_match_ext() rather than the deprecated match_ext(), fix 
warnings.

Originally committed as revision 21263 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-17 15:57:51 +00:00
Carl Eugen Hoyos
bc2d2a07d5 Make AVCodecTag.id enum CodecID and use CODEC_ID_NONE instead of 0. 
Originally committed as revision 20250 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-16 14:46:06 +00:00
Daniel Verkamp
1a40491ef2 Add ff_ prefixes to exported symbols in libavformat/riff.h. 
patch by Daniel Verkamp, aniel drv nu

Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-22 23:09:34 +00:00
Jai Menon
4fabb60ddb NSV : Add TOC2 parsing and seeking support. 
Originally committed as revision 18662 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-22 19:37:57 +00:00
Jai Menon
a00f440f37 Cosmetics : reindent after last commit and remove redundant comment. 
Originally committed as revision 18605 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-18 08:35:46 +00:00
Jai Menon
d6ce84b8f9 Add speex tag to nsv_codec_audio_tags. 
Originally committed as revision 18604 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-18 08:34:15 +00:00
Jai Menon
67d04927f7 Change nsvf_index_data to nsvs_file_offset for increased clarity. 
Originally committed as revision 18603 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-18 05:54:47 +00:00
Aurelien Jacobs
a233eaa618 use new metadata API in nsv demuxer 
Originally committed as revision 17407 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-18 00:02:38 +00:00
Diego Biurrun
517ac2434b Use more descriptive format long_names. 
Originally committed as revision 17184 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-12 17:26: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
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
Michael Niedermayer
2615800a27 Try to fix FATE after my time_base simplification change. 
Originally committed as revision 14262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-17 14:13:44 +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
Diego Biurrun
f4433de9ef consistency cosmetics: indices --> indexes 
Originally committed as revision 13444 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 23:14:25 +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
Michael Niedermayer
fffd6a5fe0 indent 
Originally committed as revision 10545 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-22 08:58:49 +00:00
Michael Niedermayer
638f489ccd fix segfault with http://samples.mplayerhq.hu/nsv/nsv_samples/ot171_novideo.nsv.bz2 
bug introduced in r8466
closes issue179

Originally committed as revision 10544 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-22 08:55:17 +00:00
Diego Biurrun
755bfeabcc misc spelling fixes 
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 09:29:25 +00:00
Aurelien Jacobs
57004ff1d7 add an enum for need_parsing 
Originally committed as revision 8742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-15 13:51:57 +00:00
Michael Niedermayer
ac5565d88c file extension based probe is max/2 
Originally committed as revision 8679 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-08 11:37:43 +00:00
Michael Niedermayer
65a00bd65a factorize 
Originally committed as revision 8678 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-08 11:37:04 +00:00