generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
38,028 Commits 24 Branches 241 Tags 173 MiB
3fa6d20533
Commit Graph

48 Commits

Author SHA1 Message Date
Michael Niedermayer
feb997577b Merge remote-tracking branch 'qatar/master' 
* qatar/master: (25 commits)
  riff: fix invalid av_freep() calls on EOF in ff_read_riff_info
  pam: Fix a typo that broke writing and reading PAM files.
  mxfdec: fix memleak on av_realloc failures
  mxfdec: Do not parse slices or DeltaEntryArrays.
  mxfdec: hybrid demuxing/seeking solution
  mxfdec: Add Avid's essence element key.
  mfxdec: Separate mxf_essence_container_uls for audio and video.
  mxfdec: Compute packet offsets properly.
  mxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack.
  mxfdec: use av_dlog() for 'no corresponding source package found'
  mxfdec: Make mxf->partitions sorted by offset.
  mxfdec: parse ThisPartition
  mxfdec: Speed up metadata and index parsing.
  mxfdec: Make sure DataDefinition is consistent between material track and source track.
  mxfdec: add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxf
  mxfdec: Add hack that adjusts the n_delta calculation when system items are present.
  mxfdec: Parse IndexTableSegments and convert them into AVIndexEntry arrays.
  mxfdec: Move FooterPartition to MXFContext and make sure it is never zero.
  mxfdec: check return value of avio_seek
  mxfdec: skip to end of structural sets
  ...

Conflicts:
	configure
	libavcodec/pnm.c
	libavformat/mxfdec.c
	libavformat/riff.c
	libavformat/rtsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-23 01:05:20 +01:00
Carl Eugen Hoyos
66b9d7065a pam: Fix a typo that broke writing and reading PAM files. 
Reported and reviewed by Derek Buitenhuis.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2012-01-22 16:38:20 +01:00
Carl Eugen Hoyos
b614c14767 Simplify 32bit pam decoding. 
Reviewed-by: Paul B Mahol
 2012-01-19 23:31:21 +01:00
Carl Eugen Hoyos
00430075bd Support 64bit pam decoding. 2012-01-17 00:42:17 +01:00
Carl Eugen Hoyos
328e79329a Support gray8a pam decoding. 2012-01-17 00:42:17 +01:00
Carl Eugen Hoyos
19b945dc2a Cosmetics: Fix indentation. 
Found by: Alexander Strasser
 2012-01-07 19:23:21 +01:00
ami_stuff
febf75f3d2 pam: Reject 64bpp rgba. 
Fixes ticket #883
 2012-01-06 01:25:54 +01:00
ami_stuff
a44b63f6c8 Support 48bpp pam decoding. 
Fixes ticket #882.
 2012-01-05 20:58:24 +01:00
ami_stuff
871e2f4fac Support 16bpp grayscale pam decoding. 
Fixes ticket #881.
 2012-01-05 20:57:49 +01:00
Carl Eugen Hoyos
190a0998c3 Fix a crash when reading gray pam files. 
Fixes ticket #837.
 2011-12-28 05:59:39 +01:00
Carl Eugen Hoyos
c1bc1967f3 Fix a typo that broke writing (and reading) PAM files. 
Reported and reviewed by Derek Buitenhuis.
 2011-12-28 05:54:59 +01:00
Michael Niedermayer
0257ac8f12 pnm: Fix spurious error message. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-08 01:33:40 +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
Reinhard Tartler
7ffe76e540 Merge libavcore into libavutil 
Done to keep ABI compatible. Otherwise this is just silly
 2011-02-16 23:00:30 +01:00
Reinhard Tartler
737eb5976f Merge libavcore into libavutil 
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-02-15 16:18:21 +01:00
Carl Eugen Hoyos
8219782a6d Do not stop decoding on pnm files with negative maxval. 
Originally committed as revision 26304 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-10 22:09:52 +00:00
Daniel Kang
ebc3488300 Check for invalid maxval in pgm decoder, fixes issue 2518. 
Patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26292 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-10 00:42:57 +00:00
Stefano Sabatini
e16f217ceb Use new imgutils.h API names, fix deprecation warnings. 
Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-07 19:15:29 +00:00
Stefano Sabatini
6ce9b4310c Remove use of the deprecated function avcodec_check_dimensions(), use 
av_check_image_size() instead.

Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-06 09:37:04 +00:00
Michael Niedermayer
63538a960e Support ASCII pnms. 
Implements issue1452.

Originally committed as revision 20687 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 16:56:13 +00:00
Diego Biurrun
8767a009a1 Move PNM init/end functions to the PNM common code. 
This is done in preparation for the PNM encoder/decoder split.

Originally committed as revision 20382 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-27 17:15:05 +00:00
Diego Biurrun
d3067047e7 whitespace cosmetics: K&R coding style, prettyprinting 
Originally committed as revision 20381 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-27 16:57:35 +00:00
Justin Ruggles
5a92cc663c pnm: Add missing 'else'. Fixes decoding for 16-bit pgm. 
Originally committed as revision 17848 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-06 00:54:49 +00:00
Peter Ross
001821904e Support 48-bit RGB PPM image. 
Originally committed as revision 17511 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 00:56:55 +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
Justin Ruggles
8fd64adf08 cosmetics: fix indentation after r15321 
Originally committed as revision 15332 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-14 22:27:47 +00:00
Justin Ruggles
0605f5c86b Return error when trying to decode non-grayscale 16-bit PNM images. 
Fixes issue 566.

Originally committed as revision 15321 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-14 15:50:59 +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
Aurelien Jacobs
9ac2e7971b rename pnm.c to pnmenc.c and pnm_common.c to pnm.c 
Originally committed as revision 8996 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-11 09:28:07 +00:00
Aurelien Jacobs
426a189b77 move pnm parser in its own file 
Originally committed as revision 8988 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-10 23:03:14 +00:00
Aurelien Jacobs
c53d2d9042 make some parser parameters const to avoid casting const to non-const 
Originally committed as revision 8921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-07 00:47:03 +00:00
Ivo van Poorten
6db140ddb4 cosmetics after last commit 
Originally committed as revision 8705 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-10 09:16:35 +00:00
Ivo van Poorten
201df5a19f Add support for grayscale images with arbitrary maxvals. 
The image data is rescaled to the nearest pix_fmt it will fit in (gray8 or
gray16). Conversion is done inside the codec in order to avoid the need
for 14 (or 65534) new pix_fmt's.

Originally committed as revision 8704 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-10 09:15:54 +00:00
Diego Biurrun
71e445fca3 Replace deprecated PIX_FMT names by the newer variants. 
Originally committed as revision 7867 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-07 01:48:09 +00:00
Baptiste Coudurier
79e7b9609e include parser.h instead of mpegvideo.h 
Originally committed as revision 6916 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-06 10:47:41 +00:00
Kostya Shishkov
22eafdf24f PGM 16-bit gray support 
Originally committed as revision 6780 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-24 05:00:14 +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
Måns Rullgård
af9e7d1810 --enable/disable parsers. Warning: some combinations are broken. 
Originally committed as revision 5691 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-09 12:02:15 +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
79396ac685 Kill some compiler warnings. Compiled code verified identical after changes. 
Originally committed as revision 4567 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-06 21:25:35 +00:00
Michael Niedermayer
1cd89f276a segfault fix 
Originally committed as revision 4531 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-08-21 15:44:59 +00:00
Roine Gustafsson
983ea0bc87 a few #ifdef CONFIG_X_ENCODER, patch by (Roine Gustafsson <roine users.sourceforge net] 
Originally committed as revision 4213 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-10 20:39:11 +00:00
Michael Niedermayer
934982c4ac avoid buf_size == 0 checks in every decoder 
Originally committed as revision 3872 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-23 18:09:06 +00:00
Michael Niedermayer
0ecca7a49f various security fixes and precautionary checks 
Originally committed as revision 3822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-12 00:16:25 +00:00
Michael Niedermayer
311c700878 merge pam_decode_frame() into pnm_decode_frame() 
Originally committed as revision 3677 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-12 23:38:43 +00:00
Michael Niedermayer
99f0623629 pnm parser 
Originally committed as revision 3675 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-12 22:55:29 +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