xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-12-13 14:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
74,570 Commits 31 Branches 338 Tags 298 MiB
d4401a9e0d
Commit Graph

26 Commits

Author SHA1 Message Date
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
Michael Niedermayer
d277b05c51 avcodec/fic: Add skip_cursor AVOption 
Previous version reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-19 13:57:36 +02:00
Paul B Mahol
392d975efe avcodec: fix clobbered ff_get_buffer() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-02-10 14:20:32 +00:00
Carl Eugen Hoyos
d457478fb0 Silence warnings for fic files with zero-sized cursors. 
Fixes ticket #4072.
 2014-11-03 00:43:08 +01:00
Michael Niedermayer
1b5ec6a0c3 avcodec/fic: Check if a frame is available before using it 
Fixes null pointer dereference
Fixes: ficvf.avi
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-22 02:22:31 +02:00
Michael Niedermayer
23cd5cb18f avcodec/fic: avoid 2 additions per idct row 
before:
5225 decicycles in IDCT, 32756 runs, 12 skips

after:
5057 decicycles in IDCT, 32765 runs, 3 skips

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 22:34:31 +02:00
Derek Buitenhuis
14da7f9eb7 fic: Support rendering cursors 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-23 13:31:22 -04:00
Derek Buitenhuis
d7eb8f9033 fic: Make warning message more accurate 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-23 17:53:00 +01:00
Derek Buitenhuis
7596fc3d4b fic: Remove redundant clips 
The equations can't overflow or underflow anyway.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-23 12:40:39 -04:00
Derek Buitenhuis
e299cb2cd3 fic: Simplify alpha blending 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-22 17:51:43 -04:00
Derek Buitenhuis
6d149d2818 fic: Use proper quantization matrix index 
The matrices are not zigzagged.

Fixes artefacting.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-22 16:22:08 -04:00
Derek Buitenhuis
9155c595f1 fic: Support rendering cursors 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-22 21:20:23 +01:00
Derek Buitenhuis
40b331e1f4 fic: Use proper quantization matrix index 
The matrices are not zigzagged.

Fixes artefacting.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-22 21:20:23 +01:00
Michael Niedermayer
6f243b17c5 avcodec/fic: Fix return value check 
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-21 14:56:17 -04:00
Michael Niedermayer
144f7a561d avcodec/fic: clear slice_data 
Fixes artifacts
Fixes use of freed memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-21 14:56:17 -04:00
Michael Niedermayer
f34d3173fc avcodec/fic: fix slice checks 
fix integer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-21 14:56:17 -04:00
Michael Niedermayer
451c78740a Merge commit '93e15a323871613fd26f1f1e317029a50b5b24ca' 
* commit '93e15a323871613fd26f1f1e317029a50b5b24ca':
  fic: use correct IDCT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-21 20:20:39 +02:00
Kostya Shishkov
93e15a3238 fic: use correct IDCT 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-21 12:37:54 -04:00
Michael Niedermayer
230db1426d avcodec/fic: Fix return value check 
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-16 02:32:37 +02:00
Michael Niedermayer
6eb08783a9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fic: Properly handle skip frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-08 00:21:22 +01:00
Derek Buitenhuis
f87a6e500b fic: Properly handle skip frames 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-03-07 14:54:33 +00:00
Michael Niedermayer
1db8bc5648 avcodec/fic: clear slice_data 
Fixes artifacts
Fixes use of freed memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 17:19:59 +01:00
Michael Niedermayer
d46ef40129 avcodec/fic: fix slice checks 
fix integer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-15 17:19:32 +01:00
Michael Niedermayer
0c4bf87b29 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Mirillis FIC video decoder

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 19:02:46 +01:00
Kostya Shishkov
cde7df25ef Mirillis FIC video decoder 
Does not contain cursor rendering yet.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-08 15:04:13 +00:00