1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

186 Commits

Author SHA1 Message Date
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
471fe57e1a avio: rename ByteIOContext to AVIOContext.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd)
2011-02-20 19:05:47 +01: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
Stefano Sabatini
b5a7100ad3 Make the image2 demuxer log more verbose
Add an error message in case the user requests to write more than one file
and the path does not contain a "%d" or "%0Nd" pattern.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 4fc9ff0ad6)
2011-01-30 03:41:00 +01:00
Stefano Sabatini
4fc9ff0ad6 Make the image2 demuxer log more verbose
Add an error message in case the user requests to write more than one file
and the path does not contain a "%d" or "%0Nd" pattern.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-28 18:04:33 +01:00
Diego Elio Pettenò
66355be3c3 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.
(cherry picked from commit c6610a216e)
2011-01-28 03:15:34 +01: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
Pascal Massimino
85f56757b4 cosmetics: align fields, and remove useless ones, in img2.c
Originally committed as revision 25539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-21 22:07:00 +00:00
Pascal Massimino
ac6d020ffa cleanup image2pipe_{de}muxer fields
Originally committed as revision 25531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-21 00:57:53 +00:00
Carl Eugen Hoyos
bba66fc7be Associate .tga with format image2.
Originally committed as revision 24079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-07 10:19:59 +00:00
Peter Ross
971c3c98b0 Add Pictor/PC Paint to image2 muxer/demuxer
Originally committed as revision 23533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-08 11:55:55 +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
Michael Niedermayer
c51131290c Dont senselessly fail on rawvideo that isnt 3 files per frame.
Originally committed as revision 22637 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-22 20:18:42 +00:00
Michael Niedermayer
ab5a0175f5 Add flag so muxers not needing width/height can signal this.
Add this flag to img2 (fixes -vcodec copy to image2 in some cases)

Originally committed as revision 21773 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-12 20:35:29 +00:00
Jai Menon
90d0379f5e Avoid using deprecated AVFormatParameters::[audio|video]_codec_id field.
Originally committed as revision 21511 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 15:45:21 +00:00
Baptiste Coudurier
77df894aed print error message when image2 muxer fail to compute frame filename
Originally committed as revision 20694 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-01 23:10:32 +00:00
Samuli Valo
c671ac40f5 Fixes detection and error reporting of non-existing files in img2.c.
Patch by Samuli Valo: name surname picturall com

Originally committed as revision 20346 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-22 16:27:01 +00:00
Baptiste Coudurier
e4b8d05d47 return EOF in image2 demuxer
Originally committed as revision 19538 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-30 08:21:11 +00:00
Carl Eugen Hoyos
a481293f13 Revert unintended hunk of r19241.
Originally committed as revision 19242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-20 14:51:03 +00:00
Carl Eugen Hoyos
df028e8c6a Revert r19239: It broke four conformance tests.
Originally committed as revision 19241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-20 14:47:38 +00:00
Jai Menon
9ed3afcb7f Print meaningful error messages when url_fopen fails.
Originally committed as revision 19230 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-20 09:00:12 +00:00
Jimmy Christensen
94d3d6a468 DPX (Digital Picture Exchange) image decoder
patch by Jimmy Christensen, jimmy ghost dk

Originally committed as revision 19163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 05:29:29 +00:00
Daniel Verkamp
effcedf738 PCX encoder that handles 1-, 8-, and 24-bpp pixfmts.
Patch by Daniel Verkamp, daniel drv nu

Originally committed as revision 18077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 17:23:45 +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
Baptiste Coudurier
b4097b13d4 add jp2 formater in image2 muxer
Originally committed as revision 16664 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-18 01:48:14 +00:00
Baptiste Coudurier
c91662ce83 include intreadwrite.h, fix compilation, img2.c use AV_RL32
Originally committed as revision 16595 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-14 01:21:24 +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
Benoit Fouet
8b2386dc5a Add jp2 support to img2 demuxer.
On behalf of Jai Menon

Originally committed as revision 16187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-17 11:22:51 +00:00
Carl Eugen Hoyos
485cfbe806 Recognize pnm file as images.
Originally committed as revision 16004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-04 15:08:04 +00:00
Carl Eugen Hoyos
a8e4161333 Add forgotten file format pgmyuv.
Originally committed as revision 15910 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-22 21:24:39 +00:00
Carl Eugen Hoyos
6bbb5bf83c Support picture output without -f image2 for most codecs.
Originally committed as revision 15909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-22 20:36:02 +00:00
Aurelien Jacobs
37d3e0667a uses FF_ARRAY_ELEMS() where appropriate
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-21 21:40:24 +00:00
Michael Niedermayer
644b0c4c92 Prevent image2 from complaining about non monotone timestamps as
there are no timestamps in "raw" image2.

Originally committed as revision 15419 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 02:07:56 +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
aecf157ed0 Mark several libavformat arrays const
Originally committed as revision 14950 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 17:24:34 +00:00
Ramiro Polla
bea91b8c29 Remove useless img_read_close().
Originally committed as revision 13674 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 17:02:06 +00:00
Ramiro Polla
2377922192 Remove unneeded NULL at end of struct.
Originally committed as revision 13673 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 17:00:28 +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
Quoc Cuong Pham
dd0f776c98 Detect "tif" suffix as TIFF.
Patch by Quoc Cuong Pham: Quoc-Cuong D PHAM AT cea D fr

Originally committed as revision 13557 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-30 13:26:40 +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 Pettenò
3375a6a597 Use strcasecmp() instead of re-inventing it.
Patch by Diego 'Flameeyes' Pettenò flameeyesATgmailPOINTcom

Originally committed as revision 13132 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-12 01:17:00 +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
Baptiste Coudurier
4e9b8211b0 useless null
Originally committed as revision 12441 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-14 13:10:49 +00:00
Baptiste Coudurier
82213f68ba remove useless img_write_trailer func
Originally committed as revision 12440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-14 12:48:13 +00:00
Loren Merritt
042e0adda9 decode mng color decorrelation
Originally committed as revision 12228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 10:21:33 +00:00
Ivo van Poorten
d43df959d7 Sun Rasterfile decoder
Originally committed as revision 11342 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-28 13:07:43 +00:00
Ivo van Poorten
b4abe1d198 PC Paintbrush PCX image decoder
Originally committed as revision 11321 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-26 22:17:46 +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
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
Måns Rullgård
75e61b0e88 use new string functions
based on patch by Reimar Döffinger

Originally committed as revision 9401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-23 23:10:32 +00:00
Ivo van Poorten
8d2fb33320 autodetect ptx files
Originally committed as revision 8938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-08 11:57:49 +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
Xiaohui Sun
2d99eed135 SGI image decoder ported to the new image API.
patch by Xiaohui Sun, sunxiaohui dsp.ac cn

Originally committed as revision 8635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-06 18:29:27 +00:00
François Revol
8fa36ae09d This fixes error handling for BeOS, removing the need for some ifdefs.
AVERROR_ defines are moved to avcodec.h as they are needed in there as well. Feel free to move that to avutil/common.h.
Bumped up avcodec/format version numbers as though it's binary compatible we will want to rebuild apps as error values changed.
Please from now on use return AVERROR(EFOO) instead of the ugly return -EFOO in your code.
This also removes the need for berrno.h.

Originally committed as revision 7965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-13 18:26:14 +00:00
Joakim Plate
e825b5009f Fix a crash when probing img2 format with a NULL filename.
patch by elupus _at_ ecce.se

Originally committed as revision 7335 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-20 23:33:50 +00:00
Baptiste Coudurier
d1e8675c2e probe with some success image files not containing number pattern but having recognized image extension
Originally committed as revision 7219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-04 11:42:48 +00:00
Kostya Shishkov
79f7c32ffb Register .tga and .tiff image extensions
Originally committed as revision 6775 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-23 13:17:46 +00:00
Baptiste Coudurier
6f9e492acf add gif support
Originally committed as revision 6761 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-22 15:07:25 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Michel Bardiaux
5c07cf535f Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be %
Original thread:
Date: Aug 30, 2006 4:54 PM
Subject: [Ffmpeg-devel] [PATCH] Clarified API for numbered sequences

Originally committed as revision 6166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-04 09:57:47 +00:00
Víctor Paesa
5894e1bbf2 add loop_input to AVFormatContext, getting rid of old hack
patch by Víctor Paesa <wzrlpy at arsystel com>

Originally committed as revision 5729 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-13 21:13:49 +00:00
Måns Rullgård
ff70e60176 allow individual selection of muxers and demuxers
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-10 21:14:37 +00:00
Måns Rullgård
d2a067d1d9 give AVInput/OutputFormat structs consistent names
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-09 23:40:53 +00:00
Michael Niedermayer
c04c3282b4 simplify AVFormatParameters NULL checks
Originally committed as revision 5146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-11 00:22:21 +00:00
Diego Biurrun
8228bff5c6 Put muxer-specific code parts in #ifdef CONFIG_MUXERS.
based on a patch by Luca Abeni <  lucabe72  #@#  email  #.#  it  >

Originally committed as revision 4871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-19 23:36:50 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Måns Rullgård
9fa62f2aad BMP image decoder
Originally committed as revision 4711 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-11-30 01:40:50 +00:00
Michael Niedermayer
01f4895c68 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-17 22:24:36 +00:00
Aurelien Jacobs
a965c478b2 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
Originally committed as revision 4275 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-19 00:06:27 +00:00
Michael Niedermayer
c0df9d75bd switch to native time bases
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-30 21:43:59 +00:00
Michael Niedermayer
644a92626a PIX_FMT_NONE and related fixes
Originally committed as revision 4161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-25 18:29:06 +00:00
Michael Niedermayer
2c34596ff7 non 4:2:0 foobar.{Y,U,V} support
Originally committed as revision 4125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-13 01:07:30 +00:00
Måns Rullgård
88730be651 kill warnings patch by (Måns Rullgård <mru inprovide com>)
Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-24 19:08:50 +00:00
Michael Niedermayer
568e18b15e integer overflows, heap corruption
possible arbitrary code execution cannot be ruled out in some cases
precautionary checks

Originally committed as revision 3813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-08 14:21:33 +00:00
Michael Niedermayer
55cf195952 .{Y,U,V} image2 support
Originally committed as revision 3802 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-04 13:27:35 +00:00
Michael Niedermayer
ae895a40c5 10l (double free)
Originally committed as revision 3764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-19 20:25:55 +00:00
Michael Niedermayer
b339fb00ba loop hack
Originally committed as revision 3687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-16 16:28:27 +00:00
Michael Niedermayer
4d4f7158ee last packet size fix
Originally committed as revision 3673 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-12 22:49:55 +00:00
Michael Niedermayer
5b6d559680 move p*m from image/lavf -> image2/lavc
video/audio_codec_id in AVFormatParameters to override/help demuxer
av_guess_codec() to guess the default codecs based upon muxer + filename

Originally committed as revision 3668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-11 18:09:28 +00:00
Michael Niedermayer
4eff7cf42d porting png support from -f image to -f image2
Originally committed as revision 3665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-09 23:31:46 +00:00
Michael Niedermayer
146210caf9 image2pipe fix
Originally committed as revision 3635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-24 22:39:08 +00:00
Michael Niedermayer
3ed0212929 10l
Originally committed as revision 3495 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-22 21:25:09 +00:00
Michael Niedermayer
61fb3183b7 support single images, remove copy/paste junk
Originally committed as revision 3320 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-15 20:15:40 +00:00
Michael Niedermayer
03cfe134ca image2 / image API cleanup phase-1
with this its possible to encode&decode any video codec to individual (1 file per frame) files

Originally committed as revision 3319 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-15 18:32:54 +00:00