virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
92,586 Commits 37 Branches 400 Tags 460 MiB
3c7a2a0b92
Commit Graph

145 Commits

Author SHA1 Message Date
Piotr Bandurski
f9a8eeb08c iff/deep: fix rle32 on big-endian 
Fixes ticket #2197.

Signed-off-by: Peter Ross <pross@xvid.org>
 2013-01-29 11:01:19 +11:00
Paul B Mahol
07a7145d89 lavc/iff: rgbn: fix decoding on big endian 
Fixes #2193.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-27 10:59:58 +00:00
Michael Niedermayer
8ab97a60ef Merge commit 'a0cabd0a27587525e90a44660c795d40d2f44fe2' 
* commit 'a0cabd0a27587525e90a44660c795d40d2f44fe2':
  mimic: cosmetics, reformat
  iff: drop ff_ prefix from a static function.
  pngdec: cosmetics, reformat.
  dxa: return meaningful error codes.
  eatgq: cosmetics, reformat.

Conflicts:
	libavcodec/dxa.c
	libavcodec/eatgq.c
	libavcodec/iff.c
	libavcodec/mimic.c
	libavcodec/pngdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-26 15:19:48 +01:00
Anton Khirnov
04e1249609 iff: drop ff_ prefix from a static function. 2013-01-26 13:02:33 +01:00
Paul B Mahol
25c75525bf lavc/iff: ilbm: unbreak decoding on big endian 
Fixes #2192.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-26 12:00:22 +00:00
Peter Ross
7016aa655b iff decoder: support RGB8 and RGBN 2012-12-11 20:17:30 +11:00
Michael Niedermayer
fc1152de41 Merge commit 'df9b9567518f2840d79a4a96b447ebe1aa326408' 
* commit 'df9b9567518f2840d79a4a96b447ebe1aa326408':
  lavc: fix decode_frame() third parameter semantics for video decoders

Conflicts:
	libavcodec/cscd.c
	libavcodec/eamad.c
	libavcodec/ffv1dec.c
	libavcodec/gifdec.c
	libavcodec/h264.c
	libavcodec/iff.c
	libavcodec/mjpegdec.c
	libavcodec/pcx.c
	libavcodec/vp56.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 17:20:19 +01:00
Michael Niedermayer
874c5b02c4 Merge commit '594d4d5df3c70404168701dd5c90b7e6e5587793' 
* commit '594d4d5df3c70404168701dd5c90b7e6e5587793':
  lavc: add a wrapper for AVCodecContext.get_buffer().

Conflicts:
	libavcodec/4xm.c
	libavcodec/8svx.c
	libavcodec/bmv.c
	libavcodec/cljr.c
	libavcodec/cscd.c
	libavcodec/dnxhddec.c
	libavcodec/dpcm.c
	libavcodec/dpx.c
	libavcodec/eacmv.c
	libavcodec/eamad.c
	libavcodec/frwu.c
	libavcodec/g723_1.c
	libavcodec/gifdec.c
	libavcodec/idcinvideo.c
	libavcodec/iff.c
	libavcodec/indeo3.c
	libavcodec/internal.h
	libavcodec/interplayvideo.c
	libavcodec/kmvc.c
	libavcodec/mpc7.c
	libavcodec/mpegaudiodec.c
	libavcodec/pcx.c
	libavcodec/pngdec.c
	libavcodec/pnmdec.c
	libavcodec/rl2.c
	libavcodec/snow.c
	libavcodec/targa.c
	libavcodec/tscc.c
	libavcodec/txd.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/vb.c
	libavcodec/vmdav.c
	libavcodec/vp56.c
	libavcodec/vqavideo.c
	libavcodec/wavpack.c
	libavcodec/wnv1.c
	libavcodec/xl.c
	libavcodec/yop.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 15:18:12 +01:00
Anton Khirnov
df9b956751 lavc: fix decode_frame() third parameter semantics for video decoders 
It's got_frame, not data size
 2012-12-04 21:45:36 +01:00
Anton Khirnov
594d4d5df3 lavc: add a wrapper for AVCodecContext.get_buffer(). 
It will be useful in the upcoming transition to refcounted AVFrames.
 2012-12-04 21:41:59 +01:00
Peter Ross
59fe5a339b iff decoder: DEEP TVDC 32-bit decoder 
Signed-off-by: Peter Ross <pross@xvid.org>
 2012-12-04 20:53:26 +11:00
Piotr Bandurski
0b14c197f1 iff: mention all decoders 2012-11-29 19:16:10 +00:00
Peter Ross
f737e76026 iff decoder: reindent 
Signed-off-by: Peter Ross <pross@xvid.org>
 2012-11-26 23:29:02 +11:00
Peter Ross
929a24efff iff decoder: merge iff ilbm and byterun1 decoders 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
 2012-11-26 23:29:02 +11:00
Peter Ross
fdd71cf04c iff decoder: initialise HAM line decoder with first palette entry 
The palette is organised into 'hold' and 'modify' pairs, hence why
the first palette entry is pal[1].

Fixes ticket #1701.

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 14:40:36 +01:00
Michael Niedermayer
0efcf16a3e replace av_log(0, by av_log(NULL, 
The first parameter is a pointer and NULL is more correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 18:10:02 +01:00
Peter Ross
ed27ed9f4f iff: DEEP RLE 32-bit decoder 
Fixes ticket #1046.

Signed-off-by: Peter Ross <pross@xvid.org>
 2012-11-20 09:49:49 +11:00
Piotr Bandurski
4413a8428a iff: decode HAM8 images with masking correctly. 
Fixes ticket #967.

Reviewed-by: Peter Ross
 2012-11-18 15:48:22 +01:00
Michael Niedermayer
2fbb37b51b iff/ilbm: check remaining buffer size. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-09 21:06:01 +01:00
Michael Niedermayer
fb6a72cde5 iff: avoid out of array reads, due to too many planes. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-09 17:47:51 +01:00
Paul B Mahol
8a4284adbf ff: fix case where image does not have alpha channel 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-30 15:28:13 +00:00
Paul B Mahol
a51540d811 lavc: do not use av_pix_fmt_descriptors directly 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-12 15:31:42 +00:00
Michael Niedermayer
ac627b3d38 Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 
* commit '716d413c13981da15323c7a3821860536eefdbbb':
  Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat

Conflicts:
	doc/examples/muxing.c
	ffmpeg.h
	ffmpeg_filter.c
	ffmpeg_opt.c
	ffplay.c
	ffprobe.c
	libavcodec/8bps.c
	libavcodec/aasc.c
	libavcodec/aura.c
	libavcodec/avcodec.h
	libavcodec/avs.c
	libavcodec/bfi.c
	libavcodec/bmp.c
	libavcodec/bmpenc.c
	libavcodec/c93.c
	libavcodec/cscd.c
	libavcodec/cyuv.c
	libavcodec/dpx.c
	libavcodec/dpxenc.c
	libavcodec/eatgv.c
	libavcodec/escape124.c
	libavcodec/ffv1.c
	libavcodec/flashsv.c
	libavcodec/fraps.c
	libavcodec/h264.c
	libavcodec/huffyuv.c
	libavcodec/iff.c
	libavcodec/imgconvert.c
	libavcodec/indeo3.c
	libavcodec/kmvc.c
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libx264.c
	libavcodec/ljpegenc.c
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc.c
	libavcodec/motionpixels.c
	libavcodec/mpeg12.c
	libavcodec/mpeg12enc.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pamenc.c
	libavcodec/pcxenc.c
	libavcodec/pgssubdec.c
	libavcodec/pngdec.c
	libavcodec/pngenc.c
	libavcodec/pnm.c
	libavcodec/pnmdec.c
	libavcodec/pnmenc.c
	libavcodec/ptx.c
	libavcodec/qdrw.c
	libavcodec/qpeg.c
	libavcodec/qtrleenc.c
	libavcodec/raw.c
	libavcodec/rawdec.c
	libavcodec/rl2.c
	libavcodec/sgidec.c
	libavcodec/sgienc.c
	libavcodec/snowdec.c
	libavcodec/snowenc.c
	libavcodec/sunrast.c
	libavcodec/targa.c
	libavcodec/targaenc.c
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/tmv.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavcodec/vb.c
	libavcodec/vp3.c
	libavcodec/wnv1.c
	libavcodec/xl.c
	libavcodec/xwddec.c
	libavcodec/xwdenc.c
	libavcodec/yop.c
	libavdevice/v4l2.c
	libavdevice/x11grab.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersrc.c
	libavfilter/drawutils.c
	libavfilter/formats.c
	libavfilter/src_movie.c
	libavfilter/vf_ass.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_format.c
	libavfilter/vf_hflip.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_yadif.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavformat/movenc.c
	libavformat/mxf.h
	libavformat/utils.c
	libavformat/yuv4mpeg.c
	libavutil/imgutils.c
	libavutil/pixdesc.c
	libswscale/input.c
	libswscale/output.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	libswscale/x86/yuv2rgb.c
	libswscale/x86/yuv2rgb_template.c
	libswscale/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 21:06:57 +02:00
Anton Khirnov
716d413c13 Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat 2012-10-08 07:13:26 +02:00
Michael Niedermayer
7a72695c05 Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
  Replace all CODEC_ID_* with AV_CODEC_ID_*
  lavc: add AV prefix to codec ids.

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	ffprobe.c
	ffserver.c
	libavcodec/8svx.c
	libavcodec/avcodec.h
	libavcodec/dnxhd_parser.c
	libavcodec/dvdsubdec.c
	libavcodec/error_resilience.c
	libavcodec/h263dec.c
	libavcodec/libvorbisenc.c
	libavcodec/mjpeg_parser.c
	libavcodec/mjpegenc.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pcm.c
	libavcodec/r210dec.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/version.h
	libavdevice/alsa-audio-dec.c
	libavdevice/bktr.c
	libavdevice/v4l2.c
	libavformat/asfdec.c
	libavformat/asfenc.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/caf.c
	libavformat/electronicarts.c
	libavformat/flacdec.c
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavformat/framecrcenc.c
	libavformat/img2.c
	libavformat/img2dec.c
	libavformat/img2enc.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/matroska.c
	libavformat/matroskadec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/movenc.c
	libavformat/mp3dec.c
	libavformat/mpeg.c
	libavformat/mpegts.c
	libavformat/mxf.c
	libavformat/mxfdec.c
	libavformat/mxfenc.c
	libavformat/nsvdec.c
	libavformat/nut.c
	libavformat/oggenc.c
	libavformat/pmpdec.c
	libavformat/rawdec.c
	libavformat/rawenc.c
	libavformat/riff.c
	libavformat/sdp.c
	libavformat/utils.c
	libavformat/vocenc.c
	libavformat/wtv.c
	libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-07 22:45:46 +02:00
Anton Khirnov
36ef5369ee Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
Michael Niedermayer
0e1925ddc4 iffdec: Fix integer overflow. 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-24 05:17:36 +02:00
Paul B Mahol
c9a96ec3c7 cosmetics: iff: fix typo 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-23 21:00:17 +00:00
Peter Ross
cc12a94c36 iff: set ham palette alpha to 0xFF 
This addresses the problem that some HAM pictures were decoded with
complete transparency as described in the 'iff: ANIM suppport ' thread
on ffmpeg-devel. The decoder was already setting alpha correctly for
CMAP palettes, just not HAM palettes.
 2012-07-23 14:04:47 +02:00
Paul B Mahol
137e80817d lavc: build some codecs only if they are actually enabled 
Saves few bytes if only some of them in same file are enabled.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-17 00:53:06 +00:00
Paul B Mahol
8f61526978 iff: check if there is extradata 
Fixes #1368.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-05-30 07:50:32 +00:00
Michael Niedermayer
849d4b0413 iff_ilbm: fix null ptr deref 
Fixes Ticket1362

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-28 17:24:13 +02:00
Michael Niedermayer
41abc9da50 iff: fix null ptr dereference 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 17:27:54 +02:00
Michael Niedermayer
6101e5322f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtpdec_asf: Set the no_resync_search option for the chained asf demuxer
  asfdec: Add an option for not searching for the packet markers
  cosmetics: Clean up the tiffenc pix_fmts declaration to match the style of others
  cosmetics: Align codec declarations
  cosmetics: Convert mimic.c to utf-8
  avconv: remove an unused function parameter.
  avconv: remove now pointless variables.
  avconv: drop support for building without libavfilter.
  nellymoserenc: fix crash due to memsetting the wrong area.
  libavformat: Only require first packet to be known for audio/video streams
  avplay: Don't try to scale timestamps if the tb isn't set

Conflicts:
	Changelog
	configure
	ffmpeg.c
	libavcodec/aacenc.c
	libavcodec/bmpenc.c
	libavcodec/dnxhddec.c
	libavcodec/dnxhdenc.c
	libavcodec/ffv1.c
	libavcodec/flacenc.c
	libavcodec/fraps.c
	libavcodec/huffyuv.c
	libavcodec/libopenjpegdec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpeg4videodec.c
	libavcodec/pamenc.c
	libavcodec/pgssubdec.c
	libavcodec/pngenc.c
	libavcodec/qtrleenc.c
	libavcodec/rawdec.c
	libavcodec/sgienc.c
	libavcodec/tiffenc.c
	libavcodec/v210dec.c
	libavcodec/wmv2dec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-07 22:41:37 +02:00
Martin Storsjö
00c3b67b8a cosmetics: Align codec declarations 
Also break some long lines, remove codec function placeholder comments
and add spaces in sample/pixel format lists.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-04-06 22:37:38 +03:00
Piotr Bandurski
ddd8974008 iff: prevent a possible crash with broken/prepared IFF PBM 
Based on fix by Peter Ross for ticket #1054.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-29 04:59:58 +02:00
Carl Eugen Hoyos
0d293880ba Match documentation for transparency in BGR32 iff images. 2012-03-19 09:49:33 +01:00
Peter Ross
e05253bf49 iff: do not decode unsupported pbms with ham decoder 
This prevents the segfault reported by ticket #1054
 2012-03-13 21:56:19 +11:00
ami_stuff
86b6e49d92 iff: check for pbm tag 
more robust

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-12 05:09:37 +01:00
Piotr Bandurski
af55a9d80a iff: add support for IFF DEEP 
Fixes trac #1045.

Thanks to Peter Ross for his help with this patch.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-09 01:55:45 +01:00
Michael Niedermayer
dda713f870 iff: Fix decode_ham_plane32() buf_size. 
The wrong variable was passed into decode_ham_plane32()
Fixes: Ticket922

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-14 01:22:38 +01:00
Peter Ross
69224582da iff: support masking plane feature 
Fixes ticket 705.

Reported-by: ami-stuff
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-15 14:13:25 +01:00
Carl Eugen Hoyos
28002030f2 Support transparency in iff images. 
Fixes ticket #707.

Reviewed-by: Peter Ross
 2012-01-14 10:38:42 +01:00
Peter Ross
52b7ed4f6e iff: support ExtraHalfBrite (EHB) palette mode 
Fixes ticket #663.

Based on patch by ami_stuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-03 03:46:14 +01:00
Peter Ross
3d977edb04 HAM6/HAM8 support for IFF ACBM decoder 
Based on patch by ami_stuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-27 03:11:08 +01:00
Peter Ross
b488679510 iff: fix invalid reads (ticket 689) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-27 03:11:08 +01:00
ami_stuff
cf14c82227 [PATCH] IFF Amiga Continuous Bitmap (ACBM)decoder 
Some sample IFF ACBM files can be found here:

http://aminet.net/package/dev/basic/ABdemos

Thanks to Peter Ross for his help with this patch.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-21 23:06:53 +01:00
Reimar Döffinger
371e165443 Try to set AVFrame.reference to correct values. 
I am not sure these new values are correct, not am I sure
the semantics are a good idea since we do not seem to make any
use of them but they caused a lot of confusion, but this
seems to make things closer to matching the documentation.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-11-05 23:25:20 +01:00
Michael Niedermayer
faba79e080 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
  H.264: tweak some other x86 asm for Atom
  probe: Fix insane flow control.
  mpegts: remove invalid error check
  s302m: use nondeprecated audio sample format API
  lavc: use designated initialisers for all codecs.
  x86: cabac: add operand size suffixes missing from 6c32576

Conflicts:
	libavcodec/ac3enc_float.c
	libavcodec/flacenc.c
	libavcodec/frwu.c
	libavcodec/pictordec.c
	libavcodec/qtrleenc.c
	libavcodec/v210enc.c
	libavcodec/wmv2dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-30 06:46:08 +02:00
Anton Khirnov
ec6402b7c5 lavc: use designated initialisers for all codecs. 
It's more readable and less prone to breakage.
 2011-07-29 08:42:34 +02:00
Stefano Sabatini
70b10db24c iff: remove get_image_data() and get_image_size() wrappers 
Remove one level of indirection, simplify code.
 2011-05-11 00:01:05 +02:00
Stefano Sabatini
8b1171e93e iff: remove get_palette_size() wrapper 
Remove one level of indirection/improve readability.
 2011-05-11 00:01:01 +02:00
Stefano Sabatini
83294a3251 iff: remove pointless get_palette_data() wrapper 
Also rename variable "extradata" to "palette" ff_cmap_read_palette()
and extract_header(), more meaningful.
 2011-05-11 00:00:52 +02:00
Stefano Sabatini
01042d4123 lavc: set defaults in internal codec frames 
This is required specifically for setting frame->format to -1,
otherwise it will be set to 0 = PIX_FMT_YUV420P and code reading
the format from the output decoded frame will get misled.

In particular fix regressions occurring with the pending vsrc_buffer
patch.
 2011-05-07 12:03:59 +02:00
Sebastian Vater
183132872a HAM6/HAM8 support for IFF demuxer/decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-24 12:45:19 +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
Diego Elio Pettenò
e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
4b21c38180 Make ff_cmap_read_palette static to libavcodec/iff.c. Delete iff.h. 
The iff.h header only declared one function that is now static, the
libavformat/iff.c source file wasn't using it before. Drop the file
entirely.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 2d162e3825)
 2011-01-28 03:15:33 +01:00
Diego Elio Pettenò
d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 16:08:45 +00:00
Diego Elio Pettenò
2d162e3825 Make ff_cmap_read_palette static to libavcodec/iff.c. Delete iff.h. 
The iff.h header only declared one function that is now static, the
libavformat/iff.c source file wasn't using it before. Drop the file
entirely.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 16:08:04 +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
Måns Rullgård
e6b22522c9 bswap: change ME to NE in macro names 
Other parts of FFmpeg use NE (native endian) rather than ME (machine).
This makes it consistent.

Originally committed as revision 24169 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-10 22:09:01 +00:00
Måns Rullgård
49bd8e4b84 Fix grammar errors in documentation 
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 15:38:06 +00:00
Peter Ross
e10412a334 IFF PBM decoder: Add a pad byte if image width is odd <aleksi dot nurmi at gmail dot com> 
Originally committed as revision 23701 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-22 12:41:17 +00:00
Sebastian Vater
522d3930ff Move get_buffer() calls from decode_init() to decode_frame(). Anything else is 
unsupported and causes crashes when libavfilter is enabled.

Patch by Sebastian Vater <cdgs basty googlemail com>.

Originally committed as revision 23411 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-01 16:36:36 +00:00
Sebastian Vater
ec1d1afc09 Factorize code into a single function. 
Patch by Sebastian Vater, cdgs D basty A gmail

Originally committed as revision 23148 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-16 21:03:08 +00:00
Sebastian Vater
6d81016282 Reindent after r23124. Patch by Sebastian Vater <cdgs basty googlemail com>. 
Originally committed as revision 23128 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 19:18:54 +00:00
Sebastian Vater
7a0e859cdb Grayscale support. Patch by Sebastian Vater <cdgs basty googlemail com>. 
Originally committed as revision 23124 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 19:16:03 +00:00
Sebastian Vater
299ac811ba Reindent after r23112. 
Patch by Sebastian Vater <cdgs basty googlemail com>.

Originally committed as revision 23113 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 15:41:49 +00:00
Sebastian Vater
65d213ec86 Move handling of paletted data to the IFF demuxer. This allows future 
handling of things such as masking/EHB/HAM for this type of data.

Patch by Sebastian Vater <cdgs basty googlemail com>.

Originally committed as revision 23112 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 15:39:40 +00:00
Sebastian Vater
ebcf7c3227 Handle palette underflows, fill remaining space with black (zero) data. 
Patch by Sebastian Vater <cdgs basty googlemail com>.

Originally committed as revision 23111 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 15:33:36 +00:00
Sebastian Vater
2f955ea41b Move a while(..){..} -> do{..}while(..), slightly faster. 
Patch by Sebastian Vater <cdgs basty googlemail com>.

Originally committed as revision 23110 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 13:18:25 +00:00
Sebastian Vater
dce2f7d36b Optimize decodeplane32(). 
Patch by Sebastian Vater <cdgs basty googlemail com>.

Originally committed as revision 23081 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-10 17:18:09 +00:00
Sebastian Vater
59cca5040e Ensure that width and height are > 0. avcodec_open() itself only checks that 
they are >= 0.

Patch by Sebastian Vater <cdgs basty googlemail com>.

Originally committed as revision 23080 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-10 17:00:56 +00:00
Sebastian Vater
9d45a32ba8 Remove "bps" parameter to decodeplane8/32(), it's unused. 
Patch by Sebastian Vater <cdgs basty googlemail com>.

Originally committed as revision 23068 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-09 20:08:13 +00:00
Måns Rullgård
79a9672d45 IFF: decode last 8 pixels per line 
The decodeplane8() function processes one byte of input less than
it should.  Also, the for loop has an unusual style with side-effects
in the controlling expression; replaced with a more intuitive while
loop.

10l to Basty.

Originally committed as revision 23063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-09 16:24:20 +00:00
Sebastian Vater
0a9cb385ad Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>. 
Originally committed as revision 23061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-08 21:48:44 +00:00
Sebastian Vater
cfdaee45d1 Align plane size to word-boundary. 
Patch by Sebastian Vater, cdgs D basty A googlemail

Originally committed as revision 23023 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-05 17:02:55 +00:00
Ronald S. Bultje
4fe4bb6150 Revert r22974 int->unsigned parts that don't have any meaningful effect. 
Originally committed as revision 23016 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-03 22:08:31 +00:00
Sebastian Vater
726dc06158 Reidnent after r22795. 
Patch by Sebastian Vater <cdgs.basty googlemail com>.

Originally committed as revision 22976 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-26 22:39:08 +00:00
Sebastian Vater
fe51b5ce50 Move some branches outside looped code. Should improve the generated asm (and 
thus performance) slightly.

Patch by Sebastian Vater <cdgs.basty googlemail com>.

Originally committed as revision 22975 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-26 22:38:41 +00:00
Sebastian Vater
473147bed0 Switch some ints to unsigned (they can only have positive values, this allows 
compiler to optimize some math from mul/div to shr/shl). Also add a cast to
uint32_t when calling decodeplane32(), this silences a compiler warning.
Lastly, in decodeplane8/32(), flatten a double-loop into a single-loop and
calculate the length once before entering the loop instead of during every
iteration (since it doesn't change).

Patch by Sebastian Vater <cdgs.basty googlemail com>.

Originally committed as revision 22974 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-26 22:37:13 +00:00
Sebastian Vater
687dc3555d Make two functions out of #define hackery. 
Patch by Sebastian Vater, cdgs D basty A googlemail

Originally committed as revision 22970 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-26 22:00:57 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands. 
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 14:45:34 +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
0edfa79b23 Make iff.c:decode_init return the value returned by 
avctx->get_buffer() in case of error, rather than AVERROR_UNKNOWN
which is deprecated, and mark AVERROR_UNKNOWN for deletion at the next
major bump.

Originally committed as revision 22512 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-13 19:19:40 +00:00
Måns Rullgård
d9747e29b6 IFF: move ff_cmap_read_palette() prototype to a header file 
Originally committed as revision 22307 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 02:36:00 +00:00
Peter Ross
f087881207 use intended const syntax 
Originally committed as revision 22165 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 09:38:09 +00:00
Peter Ross
cbba8fec23 Support <8-bit ILBM uncompressed bitmaps 
Originally committed as revision 21846 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 09:33:59 +00:00
Peter Ross
005caa3486 IFF bitmap n-bit color support 
Originally committed as revision 21831 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 11:26:35 +00:00
Reimar Döffinger
9f1d760a27 Use int8_t instead of char, the signedness of char can differ between systems. 
Originally committed as revision 21771 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 18:18:35 +00:00
Peter Ross
b9e06dddb7 IFF PBM/ILBM bitmap decoder 
Originally committed as revision 21622 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-03 09:56:16 +00:00