generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
35,708 Commits 24 Branches 241 Tags 173 MiB
0bcada9f61
Commit Graph

53 Commits

Author SHA1 Message Date
Carl Eugen Hoyos
9608e3a182 Support decoding 56 byte BMP Bitmap Information Header. 
Fixes ticket #719.
 2011-12-08 02:45:53 +01:00
Michael Niedermayer
707138593a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  adpcmenc: cosmetics: pretty-printing
  ac3dec: cosmetics: pretty-printing
  yuv4mpeg: cosmetics: pretty-printing
  shorten: remove dead initialization
  roqvideodec: set AVFrame reference before reget_buffer.
  bmp: fix some 1bit samples.
  latmdec: add fate test for audio config change
  oma: PCM support
  oma: better format detection with small probe buffer
  oma: clearify ambiguous if condition
  wavpack: Properly clip samples during lossy decode
  Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.
  Cleaned pixdesc.c file in libavutil
  zmbv.c: coding style clean-up.
  xan.c: coding style clean-up.
  mpegvideo.c: code cleanup - first 500 lines.

Conflicts:
	Changelog
	libavcodec/adpcmenc.c
	libavcodec/bmp.c
	libavcodec/zmbv.c
	libavutil/log.c
	libavutil/pixdesc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-05 00:11:57 +01:00
Carl Eugen Hoyos
1e92d58e44 bmp: fix some 1bit samples. 
<= 8bpp BMP images always have palette.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-04 16:04:27 +01:00
ami_stuff
28a11a67d2 BMP: Support BMP OS/2 v2 with RLE compression. 
Fixes ticket #699.

Patch also provided by Peter Ross.
 2011-12-03 12:34:12 +01:00
Carl Eugen Hoyos
8b08f81949 Support transparency in 32bit bmp files. 2011-12-02 00:21:24 +01:00
Carl Eugen Hoyos
0e609d7418 Fix some 1bit bmp samples, they are palletised. 
Fixes ticket #632.
 2011-11-10 23:07:27 +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
ce5e49b0c2 replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +02:00
Stefano Sabatini
975a1447f7 Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-02 12:18:44 +02:00
Baptiste Coudurier
dbfdb288c1 Set alpha of palettes to 0xff. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 21:49:45 +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
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ò
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
Carl Eugen Hoyos
05503cee00 Since lowres == crop for bmp, remove it to avoid confusion. 
Originally committed as revision 26384 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-16 12:42:43 +00:00
Måns Rullgård
8fc0162ac4 Add av_ prefix to bswap macros 
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-10 22:12:30 +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
Carl Eugen Hoyos
0fd0ef7947 Add new decoder property max_lowres and do not init decoder if requested value is higher. 
Originally committed as revision 24098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-07 21:23:36 +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
Kostya Shishkov
5073cca404 Make BMP decoder produce flipped picture with RLE compression. 
This fixes issue 1415

Originally committed as revision 20112 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 05:46:17 +00:00
Kostya Shishkov
22da339f5d Take into account real number of colours when reading BMP palette. 
This fixes issue 1408

Originally committed as revision 20007 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 05:24:46 +00:00
Baptiste Coudurier
4a89072833 bmp decoder uses get_buffer, set CODEC_CAP_DR1 
Originally committed as revision 19094 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-05 08:19:33 +00:00
Thilo Borgmann
7a00bbad21 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an 
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.

Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 15:59:50 +00:00
Kostya Shishkov
6b78a77a35 Merge some cases for reading raw data with different bit depths in BMP 
Originally committed as revision 18202 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-27 16:31:47 +00:00
Kostya Shishkov
42402a55b0 Make BMP decoder try to decode files with incorrect filesize field value 
Originally committed as revision 17363 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-16 06:57:11 +00:00
Kostya Shishkov
5d44b2a138 Silence useless compiler warning when passing AVFrame* instead of AVPicture* 
to ff_msrle_decode()

Originally committed as revision 16915 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 14:44:51 +00:00
Kostya Shishkov
c5b2fe165a Some BMP files have file size declared in the header equal to headers size 
without image data, so try to correct that value before conducting checks on
declared file size.

Originally committed as revision 15924 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-24 11:24:02 +00:00
Kostya Shishkov
e282307b21 Give more meaningful message on BMP header parsing error 
Originally committed as revision 15923 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-24 10:58:32 +00:00
Kostya Shishkov
4a14e66605 Add known BMP header sizes. 
Now 11B*.bmp from samples repository can be decoded.

Originally committed as revision 15922 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-24 10:53:13 +00:00
Kostya Shishkov
b94a631fab Cosmetics: reindent after last commit 
Originally committed as revision 15391 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-23 08:45:46 +00:00
Kostya Shishkov
fca506dfb6 Add RLE4 and RLE8 decoding support for BMP 
Originally committed as revision 15390 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-23 08:45:12 +00:00
Kostya Shishkov
15501c32d0 Add support for 1-bit, 4-bit, 8-bit and some 16-bit raw BMP 
Originally committed as revision 15389 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-23 08:38:32 +00:00
Kostya Shishkov
a79cae798a Calculate line size correctly for bit depths < 8 
Originally committed as revision 15388 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-23 08:32:18 +00:00
Kostya Shishkov
3a9a15c4f3 add newline at the end of message 
Originally committed as revision 15360 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-18 14:08:44 +00:00
Stefano Sabatini
fe4bf37455 Make AVCodec long_names definition conditional depending on CONFIG_SMALL. 
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 21:50:13 +00:00
Stefano Sabatini
bcdb2378f7 Add long names to some AVCodec declarations. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13022 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-29 21:31:21 +00:00
Benoit Fouet
6f7b915a0d Indentation 
Originally committed as revision 12816 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-14 13:15:16 +00:00
Benoit Fouet
b65213c021 Support for BMP os2v1. 
Originally committed as revision 12815 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-14 13:13:08 +00:00
Zuxy Meng
98a6fff98c Apply 'cold' attribute to init/uninit functions in libavcodec 
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 03:11:20 +00:00
Michael Niedermayer
4bae195ff5 const 
Originally committed as revision 11757 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 15:01:05 +00:00
Mark Cox
a6540c9f16 Remove redundant assignment of CODEC_ID_BMP. 
patch by mark cox   melbournemark+ffmpeg _at_ gmail.com
thread: [PATCH] Remove unessesary assignment of CODEC_ID_BMP
date: Mon, 9 Jul 2007 20:12:28 +1000

Originally committed as revision 9675 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-14 17:14:16 +00:00
Michel Bardiaux
286c71074a Add decode_end method to bmp decoder. Patch by Michel Bardiaux, 
mbardiaux mediaxim dot be.

Originally committed as revision 7796 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-01 09:48:09 +00:00
Michel Bardiaux
e8f917d6fd Fix memcpy out-of-bounds. 
patch by Michel Bardiaux, mbardiaux mediaxim be

Originally committed as revision 7780 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-31 11:19:48 +00:00
Michel Bardiaux
e96cc09dd2 Make BMP decoder use bytestream. Patch by Michel Bardiaux 
mbardiaux mediaxim dot be.

Originally committed as revision 7773 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-31 00:34:56 +00:00
Michel Bardiaux
d8b7b352a8 Fix segfault in bmp decoder. Patch by Michel Bardiaux mbardiaux mediaxim dot be. 
Originally committed as revision 7757 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-29 14:07:12 +00:00
Michel Bardiaux
76ebb18f16 Segregate code common to BMP decoder and future encoder 
patch by Michel Bardiaux, mbardiaux mediaxim be

Originally committed as revision 7721 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-27 07:39:16 +00:00
Michael Niedermayer
9ce5f3b7ea explicit values for all enums 
Originally committed as revision 7683 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-24 11:01:17 +00:00
Michael Niedermayer
3e997aa425 enum 
Originally committed as revision 7678 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-24 10:41:03 +00:00
Måns Rullgård
743311a1b0 coded line size is a multiple of 4 
Originally committed as revision 6844 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-30 20:43:07 +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