virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
28,915 Commits 37 Branches 400 Tags 464 MiB
8bce71dff5
Commit Graph

101 Commits

Author SHA1 Message Date
Peter Ross
c178fdeaec Add .dpx to the list of supported file extensions for the image2 muxer 2011-04-01 23:11:24 +11:00
Peter Ross
607cd90cdb make image2 muxer/demuxer support sequence of individual rawvideo files 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-31 23:26:28 +02:00
Peter Ross
0bb240acb3 img2: stop using CODEC_ID_RAWVIDEO to trigger processing of independant y/u/v image files 
This is requireed, as img2 will be modified soon to support .raw image file sequences.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-31 23:26:18 +02:00
Michael Niedermayer
0fecf2642b Merge remote-tracking branch 'newdev/master' 
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 17:22:52 +01:00
Anton Khirnov
b7f2fdde74 avio: rename put_flush_packet -> avio_flush 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov
db44ea960d avio: avio_ prefix for url_fsize 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 76aa876e69)
 2011-03-08 02:09:21 +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
76aa876e69 avio: avio_ prefix for url_fsize 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 11:03:39 -05:00
Anton Khirnov
324429309e lavf: use a new ffio_wfourcc macro instead of put_tag() where possible 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 0abdb29317)
 2011-02-26 03:16:04 +01:00
Anton Khirnov
0abdb29317 lavf: use a new ffio_wfourcc macro instead of put_tag() where possible 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-25 14:38:22 -05:00
Anton Khirnov
ebb92e0768 avio: rename url_fopen/fclose -> avio_open/close. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22a3212e32)
 2011-02-23 18:22:03 +01:00
Anton Khirnov
22a3212e32 avio: rename url_fopen/fclose -> avio_open/close. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 10:18:55 -05:00
Anton Khirnov
e9eb8d0bce avio: avio: avio_ prefixes for put_* functions 
In the name of consistency:
put_byte           -> avio_w8
put_<type>         -> avio_w<type>
put_buffer         -> avio_write

put_nbyte will be made private
put_tag will be merged with avio_put_str

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 77eb5504d3)
 2011-02-22 02:44:38 +01:00
Anton Khirnov
e63a362857 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>
(cherry picked from commit b7effd4e83)
 2011-02-22 02:44:37 +01:00
Anton Khirnov
77eb5504d3 avio: avio: avio_ prefixes for put_* functions 
In the name of consistency:
put_byte           -> avio_w8
put_<type>         -> avio_w<type>
put_buffer         -> avio_write

put_nbyte will be made private
put_tag will be merged with avio_put_str

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-21 14:25:15 -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
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