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

22 Commits

Author SHA1 Message Date
Ganesh Ajjanagadde
5979c740f5 lavc/dds: replace rint by lrint 
avoids float to int cast.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
 2015-12-26 20:29:22 -08:00
Andreas Cadhalpun
603ebab8d7 dds: disable palette flag for compressed dds 
Having both is not valid and can cause a NULL pointer dereference of
frame->data[1] later.

Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-11-14 21:52:11 +01:00
Andreas Cadhalpun
edd0c1d78a dds: add missing newline to log messages 
Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-11-11 21:49:51 +01:00
Andreas Cadhalpun
9a37d47644 dds: validate compressed source buffer size 
A too small buffer will cause segfaults somewhere below
decompress_texture_thread.

Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-11-11 21:49:51 +01:00
Andreas Cadhalpun
1675809d2d dds: validate source buffer size before copying 
If it is too small av_image_copy_plane segfaults.

Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-11-11 21:49:51 +01:00
Michael Niedermayer
444e9874a7 Merge commit 'def97856de6021965db86c25a732d78689bd6bb0' 
* commit 'def97856de6021965db86c25a732d78689bd6bb0':
  lavc: AV-prefix all codec capabilities

Conflicts:
	cmdutils.c
	ffmpeg.c
	ffplay.c
	libavcodec/8svx.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.c
	libavcodec/adpcm.c
	libavcodec/alac.c
	libavcodec/atrac3plusdec.c
	libavcodec/bink.c
	libavcodec/dnxhddec.c
	libavcodec/dvdec.c
	libavcodec/dvenc.c
	libavcodec/ffv1dec.c
	libavcodec/ffv1enc.c
	libavcodec/fic.c
	libavcodec/flacdec.c
	libavcodec/flacenc.c
	libavcodec/flvdec.c
	libavcodec/fraps.c
	libavcodec/frwu.c
	libavcodec/gifdec.c
	libavcodec/h261dec.c
	libavcodec/hevc.c
	libavcodec/iff.c
	libavcodec/imc.c
	libavcodec/libopenjpegdec.c
	libavcodec/libvo-aacenc.c
	libavcodec/libvorbisenc.c
	libavcodec/libvpxdec.c
	libavcodec/libvpxenc.c
	libavcodec/libx264.c
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c
	libavcodec/mpegaudiodec_float.c
	libavcodec/msmpeg4dec.c
	libavcodec/mxpegdec.c
	libavcodec/nvenc_h264.c
	libavcodec/nvenc_hevc.c
	libavcodec/pngdec.c
	libavcodec/qpeg.c
	libavcodec/ra288.c
	libavcodec/rv10.c
	libavcodec/s302m.c
	libavcodec/sp5xdec.c
	libavcodec/takdec.c
	libavcodec/tiff.c
	libavcodec/tta.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/vp6.c
	libavcodec/vp9.c
	libavcodec/wavpack.c
	libavcodec/yop.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 22:50:18 +02:00
Vittorio Giovara
def97856de lavc: AV-prefix all codec capabilities 
Express bitfields more simply.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-27 15:24:58 +01:00
Martin Storsjö
44f7df0c98 dds: Write the palette in the native endian form 
This fixes the palette on big endian, broken (or, differing from
little endian) since 57214b2f7.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-07-23 19:07:43 +03:00
Tom Butterworth
ebe8b5d947 dds: Fix the slice size computation 
A bug was introduced in 6b2b26e7af whereby when
frame height wasn't divisible by the number of threads, pixels would be omitted
from the bottom rows during decode.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-23 10:45:40 +02:00
Michael Niedermayer
157fa73992 Merge commit 'ebe8b5d947c41449c684f17c6826fe6bc46c0360' 
* commit 'ebe8b5d947c41449c684f17c6826fe6bc46c0360':
  dds: Fix the slice size computation

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 12:20:53 +02:00
Michael Niedermayer
eaf15bba03 Merge commit 'ea4d46e72945cba37feb7aa154eb970732f513e4' 
* commit 'ea4d46e72945cba37feb7aa154eb970732f513e4':
  dds: Fix enum declaration

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 17:14:24 +02:00
Michael Niedermayer
d08d8b61aa dds: Fix 32bpp bitmaps decoding 
Found-By: ami_stuff
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-22 13:35:44 +01:00
Vittorio Giovara
57214b2f7f dds: Fix palette decoding 
Red and blue channels were decoded in the wrong order.

Found-By: ami_stuff
 2015-07-22 13:35:44 +01:00
Vittorio Giovara
ea4d46e729 dds: Fix enum declaration 
Drop the global variables with anonymous enum type.
 2015-07-22 13:35:43 +01:00
Michael Niedermayer
8fe00dd18a Merge commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc' 
* commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc':
  dds: Decode using optimal slices sizes

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-21 20:35:59 +02:00
Luca Barbato
6b2b26e7af dds: Decode using optimal slices sizes 
Enjoy some cache locality and use less threads.
About the same speedup provided to HAP.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-07-21 12:14:25 +02:00
Michael Niedermayer
5c583b1419 avcodec/dds: Flip more R<->B cases 
Fixes Ticket4665

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-20 00:03:11 +02:00
Michael Niedermayer
36a87c2dc7 avcodec/dds: fix paletted files 
Fixes Ticket4664

The changed fate tests lack red/blue shades and thus look correct
either way

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 23:26:59 +02:00
Luca Barbato
4d55484391 dds: Fix palette mode on big endian 
Found-By: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-06-24 14:45:16 +01:00
Michael Niedermayer
21d2e3d602 avcodec/dds: Fix palettes on big endian 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-22 23:59:28 +02:00
Michael Niedermayer
ff68b83968 Merge commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2' 
* commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2':
  DirectDraw Surface image decoder

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/version.h
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-22 23:34:56 +02:00
Vittorio Giovara
5c018ee188 DirectDraw Surface image decoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-06-22 15:23:08 +01:00