ffmpeg

Author	SHA1	Message	Date
Reimar Döffinger	87c7fb2b21	aacsbr: support hardcoding tables. For sbr_qmf_window_us there is even a question if it maybe should be fully hardcoded all the time. Since half of it is coded, it ends up in .data and not .bss. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-09-06 20:59:20 +02:00
Mickaël Raulet	684d0a0b23	avcodec/hevc: fix dead code fix CID 1231985 cherry picked from commit 745a35a777eaa5f77b8660b44098110a29916aae Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-06 20:36:27 +02:00
Michael Niedermayer	1654ca7d4e	avcodec/mjpegdec: fix rounding of chroma_height Fixes green line at the bottom Fixes Ticket3913 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-06 03:13:57 +02:00
Michael Niedermayer	dcb29d37d4	avcodec/mpegvideo: set codec tags in ff_mpv_decode_init() Fixes Ticket3912 Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-05 20:48:23 +02:00
Michael Niedermayer	4dee4a4470	avcodec/mpegvideo: Factor ff_mpv_decode_init() out Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-05 20:48:06 +02:00
Michael Niedermayer	0a7239ae25	Merge commit '2143948381c8118bdc2f50bd4079520b9885bd54' * commit '2143948381c8118bdc2f50bd4079520b9885bd54': Drop unnecessary av_unused attributes. Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-05 20:21:47 +02:00
Michael Niedermayer	1e4e760f76	Merge commit '213e606752d16f51337e94431962fb5d7749c07e' * commit '213e606752d16f51337e94431962fb5d7749c07e': Replace av_unused attributes by block structures Conflicts: libavcodec/h264_loopfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-05 19:24:49 +02:00
Michael Niedermayer	73aeb27cfe	Merge commit '096a1d5b46391f65dfd0bee6292e9962f53bd7c8' * commit '096a1d5b46391f65dfd0bee6292e9962f53bd7c8': rdft: Move some variables into a separate block Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-05 19:16:15 +02:00
Michael Niedermayer	8c6cfffa01	Merge commit 'b574e1e97ea7067a5fcd3876e30a67df0e4e6611' * commit 'b574e1e97ea7067a5fcd3876e30a67df0e4e6611': get_bits: Add OPEN_READER macro variant w/o size_plus8 Conflicts: libavcodec/get_bits.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-05 19:08:27 +02:00
Diego Biurrun	2143948381	Drop unnecessary av_unused attributes.	2014-09-05 13:55:04 +02:00
Diego Biurrun	213e606752	Replace av_unused attributes by block structures This is more portable and avoids warnings with compilers that do not properly support av_unused.	2014-09-05 13:55:04 +02:00
Diego Biurrun	096a1d5b46	rdft: Move some variables into a separate block This avoids an unused variable warning with hardcoded tables.	2014-09-05 13:55:03 +02:00
Diego Biurrun	b574e1e97e	get_bits: Add OPEN_READER macro variant w/o size_plus8 This avoids a trillion warnings from MSVC.	2014-09-05 13:55:03 +02:00
Benoit Fouet	4f10495055	tiff: fix {2,4}bpp grayscale palettes. Create a default grayscale palette for 2 or 4 bpp grayscale tiff, if there is no palette defined. Fixes ticket #3915 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-05 12:57:22 +02:00
Stefano Sabatini	39b517fac0	lavc/libvpxenc: show crf CQ value in error message	2014-09-05 11:20:07 +02:00
James Almer	52ec81c67d	x86/hevc_res_add: add missing guards to hevc_transform_add32_8_avx2 Should fix compilation with old Yasm/Nasm versions. Signed-off-by: James Almer <jamrial@gmail.com>	2014-09-04 23:34:01 -03:00
James Almer	c3d2426cca	x86/hevc_res_add: add ff_hevc_transform_add32_8_avx2 ~20% faster than AVX. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>	2014-09-04 20:21:29 -03:00
James Darnley	46ef45ab59	lavc/x86/v210: give cpuflag to INIT macro This lets the cglobal macro automatically append a suffix to the function name. This means that INIT_XMM avx must be used rather than INIT_AVX. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-05 00:35:07 +02:00
Michael Niedermayer	ddc6adaa28	Merge commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2' * commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2': vc1: Split bits used in libavformat into a separate header Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-04 20:09:01 +02:00
Michael Niedermayer	5a20f1885d	Merge commit 'f20518568a77a6138fc74021ce56013ab72907ba' * commit 'f20518568a77a6138fc74021ce56013ab72907ba': build: Split WMA frequencies into a separate object file Conflicts: configure libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-04 19:46:06 +02:00
Michael Niedermayer	91a8b933fb	Merge commit '803f8992f11d1eb301672cd13c685a7b1d04c467' * commit '803f8992f11d1eb301672cd13c685a7b1d04c467': build: cosmetics: Group hwaccel OBJS declarations together Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-04 19:18:08 +02:00
Michael Niedermayer	a52e74db17	Merge commit '2b8b0da09cf0dc2535de42f95110eb633f36d8c8' * commit '2b8b0da09cf0dc2535de42f95110eb633f36d8c8': fdctdsp: cosmetics: Drop one unnecessary if-block level Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-04 19:10:33 +02:00
Diego Biurrun	4d55e9de27	vc1: Split bits used in libavformat into a separate header This reduces inter-library dependencies.	2014-09-04 07:11:03 -07:00
Diego Biurrun	f20518568a	build: Split WMA frequencies into a separate object file These are the only WMA bits shared with binkaudio. Splitting them off reduces the binnkaudio dependency on general WMA code.	2014-09-04 05:19:46 -07:00
Diego Biurrun	803f8992f1	build: cosmetics: Group hwaccel OBJS declarations together	2014-09-04 05:19:39 -07:00
Michael Niedermayer	75a9859ac6	Merge commit 'd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b' * commit 'd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b': wma: K&R formatting cosmetics Conflicts: libavcodec/wma.c libavcodec/wmadec.c libavcodec/wmaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-03 22:10:21 +02:00
Reimar Döffinger	235d401bfa	vorbisenc: avoid large stack allocation. Code is only used during initialization, so malloc/free should be fine to use. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-09-03 21:22:59 +02:00
Reimar Döffinger	fcfc90ed65	svq1enc: remove pointless array element. Not sure it was meant to be used for something at some point though. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-09-03 21:22:58 +02:00
Reimar Döffinger	6724254118	ffv1enc: reduce stack usage. A bit more complex than e.g. adding it to the context, but using the context for something that will be used only during initialization seemed a bit wasteful. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-09-03 21:22:58 +02:00
Diego Biurrun	2b8b0da09c	fdctdsp: cosmetics: Drop one unnecessary if-block level	2014-09-03 03:13:56 -07:00
Michael Niedermayer	eacf42dd50	Merge commit '4912b634b517c8acfc476c5d47f10be83fe7e18b' * commit '4912b634b517c8acfc476c5d47f10be83fe7e18b': x265: Use the encoder defaults Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-03 12:10:09 +02:00
Gabriel Dume	d2a4e4b9cc	wma: K&R formatting cosmetics Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-09-03 03:09:08 -07:00
Michael Niedermayer	928cb84b32	avcodec/idctdsp: Initialize ff_put/add_pixels_clamped correctly so that the optimized functions are also used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-03 05:19:06 +02:00
Michael Niedermayer	50841da143	avcodec/mpeg4videodec: fix automatic use of the xvid idct on non x86 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-03 05:19:06 +02:00
Michael Niedermayer	feac9cbed0	Merge commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce' * commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce': wmv2: K&R formatting cosmetics Conflicts: libavcodec/wmv2.c libavcodec/wmv2dec.c libavcodec/wmv2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-03 04:13:37 +02:00
Michael Niedermayer	5b58d79a99	Merge commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453' * commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453': xvid: Add C IDCT Conflicts: libavcodec/dct-test.c libavcodec/xvididct.c See: `298b3b6c1f` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-03 04:09:38 +02:00
Michael Niedermayer	5db23c07a3	Merge commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b' * commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b': idctdsp: Add global function pointers for {add\|put}_pixels_clamped functions Conflicts: libavcodec/arm/idctdsp_init_arm.c libavcodec/dct.h libavcodec/idctdsp.c libavcodec/jrevdct.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-03 03:19:40 +02:00
Luca Barbato	4912b634b5	x265: Use the encoder defaults Reset the settings as it is done for x264.	2014-09-03 02:14:17 +02:00
Gabriel Dume	eda7571ea1	wmv2: K&R formatting cosmetics Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-09-02 16:14:22 -07:00
Pascal Massimino	7a1d6ddd2c	xvid: Add C IDCT Thanks to Pascal Massimino and Michael Militzer for relicensing as LGPL. Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-09-02 14:41:13 -07:00
Diego Biurrun	95c0cec03a	idctdsp: Add global function pointers for {add\|put}_pixels_clamped functions These function pointers already existed in the ARM code. Adding them globally allows calls to the function pointers to access arch-optimized versions of the functions transparently.	2014-09-02 14:41:13 -07:00
Michael Niedermayer	9e59a7be1c	Merge commit '91d305790ea0f6fe0f54b48236da42181c39c18b' * commit '91d305790ea0f6fe0f54b48236da42181c39c18b': get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE Conflicts: libavcodec/golomb.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-02 22:18:12 +02:00
Michael Niedermayer	c8be5258de	Merge commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef' * commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef': flv: K&R formatting cosmetics Conflicts: libavcodec/flv.h libavcodec/flvdec.c libavcodec/flvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-02 22:07:06 +02:00
Michael Niedermayer	4c73123333	Merge commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67' * commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67': asv: K&R formatting cosmetics Conflicts: libavcodec/asvdec.c libavcodec/asvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-02 21:57:46 +02:00
Michael Niedermayer	50c6bffb67	Merge commit '74512f7e369da40e1148c92b58cd8e59f7737b8f' * commit '74512f7e369da40e1148c92b58cd8e59f7737b8f': 8svx: Return proper error codes Conflicts: libavcodec/8svx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-02 21:45:58 +02:00
Reimar Döffinger	3980ab12b7	rangecoder-test: Allow running with small stack size. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-09-02 19:20:28 +02:00
Reimar Döffinger	e48cd2de98	rl.h: Use on-stack temporary VLC tables instead of having them static. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-09-02 19:20:28 +02:00
Reimar Döffinger	2ca78936c7	rl.h: remove deprecated and now unused vlc member. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-09-02 19:20:27 +02:00
Michael Niedermayer	1587989518	avcodec/rawdec: Support CODEC_CAP_PARAM_CHANGE Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-02 13:35:36 +02:00
Diego Biurrun	91d305790e	get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE The HAVE_ prefix is reserved for macros set by configure.	2014-09-02 13:10:38 +02:00
Gabriel Dume	ff4d1aa8bc	flv: K&R formatting cosmetics Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-09-02 04:03:45 -07:00
Gabriel Dume	f61e47dd68	asv: K&R formatting cosmetics Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-09-02 03:45:21 -07:00
Gabriel Dume	74512f7e36	8svx: Return proper error codes Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-09-02 03:42:13 -07:00
Michael Niedermayer	f9aadf1fc4	Merge commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5' * commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5': mpeg4videodec: Fix low_delay error message Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-01 21:01:33 +02:00
Michael Niedermayer	f626eaa58e	Merge commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2' * commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2': aac_adtstoasc_bsf: Return proper error code Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-01 20:51:44 +02:00
Michael Niedermayer	38c4316fff	Merge commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae' * commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae': dxva2: Clean up definition of _WIN32_WINNT Conflicts: libavcodec/dxva2.h See: `89946c8403` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-01 20:45:50 +02:00
Michael Niedermayer	052cd1ce72	Merge commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098' * commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098': dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer() Conflicts: libavcodec/dxva2_h264.c libavcodec/dxva2_mpeg2.c libavcodec/dxva2_vc1.c See: `64c53fa16a` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-01 20:31:13 +02:00
Michael Niedermayer	a2dbf379f0	avcodec/dvbsubdec: make compute_edt user settable Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-01 19:51:58 +02:00
Reimar Döffinger	e8d0b84e8a	h261dec, ituh263dec: Move condition. Stops compiler from doing incredibly stupid things. With vsynth1-flv inner loop goes from 3501 to 3275 decicycles. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-09-01 19:41:20 +02:00
Reimar Döffinger	36c0043344	h261dec, ituh263dec: ensure CLOSE_READER is done on error paths, too. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-09-01 19:41:20 +02:00
Reimar Döffinger	2a00812d82	h261dec, ituh263dec: Avoid unnecessary -1 inside inner loop. 3646 -> 3597 decicycles in inner loop when decoding vsynth1-flv. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-09-01 19:41:20 +02:00
Gabriel Dume	e205fe6831	mpeg4videodec: Fix low_delay error message Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-09-01 05:37:00 -07:00
Gabriel Dume	63f800ca5f	aac_adtstoasc_bsf: Return proper error code Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-09-01 05:37:00 -07:00
Diego Biurrun	b8962d64cc	dxva2: Clean up definition of _WIN32_WINNT Only set a value if _WIN32_WINNT is undefined or smaller than 0x0600. This is cleaner than unconditional definition and avoids a number of redefinition warnings. Also only define a value in one of the two dxva2 headers.	2014-09-01 12:23:59 +02:00
Diego Biurrun	4600a85eaa	dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer() This avoids related incompatible pointer type warnings.	2014-09-01 12:23:58 +02:00
Michael Niedermayer	37c46743ee	avcodec: fix missing doxygen comment marker	2014-09-01 00:52:22 +01:00
Reimar Döffinger	935453102b	ituh263dec: Optimize new RL_VLC based decoding. Together with the switch to RL_VLC this results in a speedup of about 30% in this inner loop. Overall speedup only relevant for medium to high bitrate streams. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-08-31 20:13:58 +02:00
Reimar Döffinger	c0d32686dd	h261dec: Optimize new RL_VLC based decoding. Together with the switch to RL_VLC this results in about 10% speedup for this inner loop. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-08-31 20:13:51 +02:00
Reimar Döffinger	da0a670b3c	h261, h263 decoders: convert to RL_VLC. Some additional optimizations in following patch. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-08-31 20:09:54 +02:00
Reimar Döffinger	3efc174fd6	aacps_tablegen: replace TABLE_CONST by const. Doesn't change generated code, just is more consistent and a bit less error-prone. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-08-31 18:33:27 +02:00
Michael Niedermayer	f0d4f00f24	avcodec/mjpegdec: fix green line at the bottom with upscale v Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-31 15:33:30 +02:00
Michael Niedermayer	63a52ca134	avcodec/mjpegdec: fix green vertical line at the right with upscale h Fixes Ticket3891 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-31 15:16:36 +02:00
Reimar Döffinger	03bf457241	Add av_cold to table generation functions. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-08-31 10:33:02 +02:00
Reimar Döffinger	4fe448738e	WMA: add "const" to avoid warnings with hardcoded tables. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-08-31 10:31:09 +02:00
Reimar Döffinger	3bc5d2a064	ac3dec_fixed: add missing "static const". Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-08-31 10:25:36 +02:00
Reimar Döffinger	18464d7270	sipr16kdata.h: add forgotten const. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-08-31 10:25:36 +02:00
Reimar Döffinger	2bb66cc8be	fft_template: Move variables to where they are used. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-08-31 10:25:36 +02:00
Reimar Döffinger	1654514ab0	fft: add ff_ prefix to some global arrays. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-08-31 10:25:36 +02:00
Michael Niedermayer	e0237208b4	avcodec/h264: Do not get stuck on IDR inter frames Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-31 04:09:06 +02:00
Reimar Döffinger	e2cd28c926	fft: add missing const. This table was the largest object in FFmpeg's .data, and really should be in .rodata. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-08-30 16:33:00 +02:00
Christophe Gisquet	a808733675	proresenc_ks: allow auto-selecting profile The user may not know how to select the profile, nor what he needs, in particular to encode alpha. Therefore, use an automatic selection as default, and warn when the manually selected profile may cause issues. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-30 14:16:26 +02:00
Michael Niedermayer	1402873601	avcodec/vp3data: use more compact data types Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-30 13:45:15 +02:00
Michael Niedermayer	e16b7338d8	avcodec/aarch64/h264qpel_init_aarch64: mark src as const Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-30 12:48:31 +02:00
Michael Niedermayer	596636a474	avcodec/snow: check coeffs for validity Fixes deadlock Fixes integer overflow Fixes Ticket 3892 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-30 02:12:10 +02:00
Reimar Döffinger	d9e2aceb7f	Add missing "const" all over the place. Only "./configure --enable-gpl" on x86 was tested. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-08-29 18:57:25 +02:00
Paul B Mahol	be3d8073ed	avcodec/wavpack: increase WV_MAX_SAMPLES This is maximal number of samples per frame that current wavpack can create. Signed-off-by: Paul B Mahol <onemda@gmail.com>	2014-08-29 10:37:49 +00:00
Michael Niedermayer	22652dc2b8	avcodec/avcodec: fix missing doxygen comment marker Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-29 01:31:10 +02:00
Michael Niedermayer	f30a8154ab	Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5' * commit '9301486408a480629336af4d7fd873c0f28fb2d5': avcodec: add stream-level stereo3d side data Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/utils.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-28 22:23:01 +02:00
Vittorio Giovara	9301486408	avcodec: add stream-level stereo3d side data	2014-08-28 12:33:26 -04:00
Michael Niedermayer	ef768ab976	avcodec/h264: Move h264_vdpau_class under ifdef to avoid unused variable warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-28 16:03:28 +02:00
Michael Niedermayer	87961a8a50	avcodec/flashsv2enc: fix "unused variable" warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-28 15:50:35 +02:00
Deb Mukherjee	b543a29020	avcodec/libvpxenc: Adds support for constant quality mode in VP9. Changes in the parameter mapping for libvpx to support the constant quality mode in VP9. The assumption in the patch is that if crf is provided but bitrate is 0, then the 'constant quality' mode of VP9 is used. However if both are present, the 'constrained quality' mode is used as before. Reviewed-by: James Zern <jzern@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-28 15:21:57 +02:00
Deb Mukherjee	b6a0b8bcf4	Adds support for setting aq_mode in libvpx encoder Reviewed-by: James Zern <jzern@google.com> Signed-off-by: James Almer <jamrial@gmail.com>	2014-08-27 23:12:47 -03:00
James Darnley	8c1b942ad7	Replace incorrect use of "multiply" with "multiple" Also replace the plural form "multiplies" with "multiples".	2014-08-27 16:00:17 -08:00
Michael Niedermayer	5403a288a7	Merge commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc' * commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc': x86: xvid: K&R formatting cosmetics Conflicts: libavcodec/x86/xvididct_sse2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-27 21:20:39 +02:00
Michael Niedermayer	b3b05a11d3	Merge commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5' * commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5': cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs Conflicts: libavcodec/mpeg4videodec.c libavcodec/x86/Makefile libavcodec/x86/dct-test.c libavcodec/x86/xvididct_sse2.c libavcodec/xvididct.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-27 21:09:30 +02:00
Michael Niedermayer	3ff5ca89fc	Merge commit '1f156af4274dc72d588620f6bedb4e9e66023c92' * commit '1f156af4274dc72d588620f6bedb4e9e66023c92': x86: xvid_idct: Drop unused definitions Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-27 21:01:54 +02:00
Michael Niedermayer	a59d922d24	Merge commit 'ff771f79b55a346b4163d814b58ee4c98114745e' * commit 'ff771f79b55a346b4163d814b58ee4c98114745e': vc1: Initialize start_code_found to 0 Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-27 20:44:40 +02:00
James Almer	7997d78643	lavc/libwebpenc: use WebPMemoryWriterClear() WebPMemoryWriterClear() must be used instead of free() when libwebp ABI version is > 0x0203 Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>	2014-08-27 15:42:13 -03:00
Diego Biurrun	8d27bf1cff	x86: xvid: K&R formatting cosmetics	2014-08-27 05:58:04 -07:00
Jean-Francois Thibert	12df9b9a15	Improved AC3 decoder level support (heavy drc, dialnorm) Added support for AC3 heavy dynamic range compression used to restrict the output range and added a setting to specify the output target level and use the dialog normalization field to apply it in the digital domain. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-27 14:31:39 +02:00
Diego Biurrun	dcb7c868ec	cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs	2014-08-27 04:54:05 -07:00
Diego Biurrun	1f156af427	x86: xvid_idct: Drop unused definitions	2014-08-27 04:36:41 -07:00
Luca Barbato	ff771f79b5	vc1: Initialize start_code_found to 0 Leftover of `a4d3c20035`.	2014-08-27 12:36:41 +02:00
Michael Niedermayer	570397c731	Merge commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0' * commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0': h264: fully check cropping amount from sps Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-26 22:01:45 +02:00
Michael Niedermayer	9c41b59423	Merge commit '0a024268261d05ccdcf7e03c85fb78d22037a464' * commit '0a024268261d05ccdcf7e03c85fb78d22037a464': libxvid: K&R formatting cosmetics Conflicts: libavcodec/libxvid.c libavcodec/libxvid_rc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-26 21:45:39 +02:00
Hii	604c4eab2b	libx264: fix -b_qfactor and -chromaoffset Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-26 20:03:42 +02:00
Vittorio Giovara	e87f5e4e5f	h264: fully check cropping amount from sps Even if sps.crop is true, the cropping amount may be zero. Fixes a sample with a valid but broken container cropping.	2014-08-26 13:31:29 -04:00
Gabriel Dume	0a02426826	libxvid: K&R formatting cosmetics Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-08-26 19:22:17 +02:00
Michael Niedermayer	85f0bde4f0	avcodec/snowenc: remove out-commented assert Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-26 15:20:58 +02:00
Michael Niedermayer	ba650ea118	Merge commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e' * commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e': vc1: Fix the skip condition Conflicts: libavcodec/vc1_parser.c See: `ede411dd03` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-26 13:01:06 +02:00
Luca Barbato	a4d3c20035	vc1: Fix the skip condition As written in the comment above, skip must be added only if a start code is found.	2014-08-26 03:43:13 +02:00
Christophe Gisquet	f75baa6c9b	huffyuvdec: decode the last odd sample Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-25 23:24:07 +02:00
Christophe Gisquet	6ee7681723	huffyuvenc: write last odd sample If width is odd, last sample wouldn't be written. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-25 23:12:30 +02:00
Michael Niedermayer	2a85826e57	avcodec/vp9: Use av_malloc_array() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-25 22:55:11 +02:00
Michael Niedermayer	52fca28c3b	avcodec/vorbisenc: use av_malloc(z)_array() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-25 16:03:54 +02:00
Michael Niedermayer	d647ef0c80	avcodec/mpegvideo_parser: consider vbv_delay in bitrate heuristic also for mpeg2 Fixes bitrate detection in CBR mpeg2 Fixes ticket3678	2014-08-25 14:15:43 +02:00
Michael Niedermayer	a2841d92c3	Revert "pnmenc: use bits_per_raw_sample" This reverts commit `1506ea947d`. Revert requested by carl as well as author in "Re: [FFmpeg-devel] [PATCH]Fix pnm encoding with bpc set"	2014-08-25 02:59:17 +02:00
Michael Niedermayer	30f680ee0a	avcodec/vc1dec: fix null pointer dereference Fixes Ticket3860 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-25 02:18:31 +02:00
Michael Niedermayer	3fe9e7be4c	avcodec/utils: add GBRP16 to avcodec_align_dimensions2() Fixes Ticket3869 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-24 23:33:40 +02:00
Carl Eugen Hoyos	cc0acdbd68	lavc/h264_slice: Add a missing newline to an error message.	2014-08-24 15:33:10 +02:00
Clément Bœsch	f888331769	avfilter: add codecview filter	2014-08-24 14:35:11 +02:00
Paul B Mahol	6dfa70f272	Correct few "ffmpeg" typos Signed-off-by: Paul B Mahol <onemda@gmail.com>	2014-08-24 11:05:42 +00:00
Paul B Mahol	b73b36bfa5	avcodec/xan: fix style issue Signed-off-by: Paul B Mahol <onemda@gmail.com>	2014-08-24 10:54:11 +00:00
Christophe Gisquet	3e892b2bcd	x86: hevc_mc: split differently calls In some cases, 2 or 3 calls are performed to functions for unusual widths. Instead, perform 2 calls for different widths to split the workload. The 8+16 and 4+8 widths for respectively 8 and more than 8 bits can't be processed that way without modifications: some calls use unaligned buffers, and having branches to handle this was resulting in no micro-benchmark benefit. For block_w == 12 (around 1% of the pixels of the sequence): Before: 12758 decicycles in epel_uni, 4093 runs, 3 skips 19389 decicycles in qpel_uni, 8187 runs, 5 skips 22699 decicycles in epel_bi, 32743 runs, 25 skips 34736 decicycles in qpel_bi, 32733 runs, 35 skips After: 11929 decicycles in epel_uni, 4096 runs, 0 skips 18131 decicycles in qpel_uni, 8184 runs, 8 skips 20065 decicycles in epel_bi, 32750 runs, 18 skips 31458 decicycles in qpel_bi, 32753 runs, 15 skips Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-24 12:05:33 +02:00
Christophe Gisquet	38e2aa3759	x86: hevc_mc: correct unneeded use of SSE4 code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-24 11:43:33 +02:00
Christophe Gisquet	1506ea947d	pnmenc: use bits_per_raw_sample This allows writing actual bitdepth in RGB48 when it isn't actually 16. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-24 11:23:34 +02:00
ThomasVolkert	50a4d5cfc6	Add support for H.261 RTP payload format (RFC 4587)	2014-08-24 03:53:30 +02:00
Michael Niedermayer	ab1e431288	avcodec/tiff: Make pixel format checks tighter Fixes assertion failure with imgsrc001-lzma.tiff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-24 01:55:19 +02:00
James Almer	b140b51ebb	lavc/tiff: add support for LZMA compression Derived from deflate code. Requires liblzma. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-24 01:21:39 +02:00
Michael Niedermayer	1fa35e4352	avcodec/h264_slice: More complete cleanup in h264_slice_header_init() Fixes null pointer dereference Fixes Ticket3873 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-23 03:47:14 +02:00
Michael Niedermayer	949057c958	avcodec/h264: do proper cleanup in ff_h264_alloc_tables() in case DPB alloc fails Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-23 03:47:14 +02:00
Michael Niedermayer	7444cf9a9c	avcodec/imc: Fix bitstream buffer padding Fixes buffer overread Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-23 01:34:28 +02:00
Christophe Gisquet	585047bb7d	h264: do not return on sidedata allocation failure Not having allocated it is not a good reason to leave the object in an undetermined state. Though a particular setting like the AV_EF_* flags could be useful to control that behaviour. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-23 01:01:57 +02:00
Michael Niedermayer	aaaf7261b7	avcodec/hevc_ps: fix 1 vs. 0 typo Found-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-22 23:00:41 +02:00
Christophe Gisquet	4adad5a19a	wavpackenc: reset trailer info on block encoding In some cases, in particular if several blocks are needed because of the channel layout (e.g. 2.1), the information used to write the trailing bits terminating the sample data was not reset. This would cause potential desync on the decoder, although decoded samples were actually mostly fine. Fixes ticket #3879.	2014-08-22 18:44:16 +00:00
Christophe Gisquet	a59f85d106	wavpack: check number of channels This means container and codec disagree. The codec is supposed to know better so this could be an error instead.	2014-08-22 18:43:30 +00:00
Michael Niedermayer	e356f6c55d	Merge commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08' * commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08': rv34: use ff_mpeg_update_thread_context only when decoder is fully initialized Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-22 18:49:52 +02:00
Christophe Gisquet	2346f2b5db	x86: hevcdsp: use compilation-time-fixed constant The stride for some buffers is known. Reviewed-by: Mickaël Raulet <mraulet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-22 16:26:30 +02:00
Christophe Gisquet	dad7f15567	hevcdsp: remove more instances of compile-time-fixed parameters Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-22 15:22:42 +02:00
Christophe Gisquet	d4f44b66d3	hevcdsp: remove compilation-time-fixed parameter The dststride parameter is always MAX_PB_SIZE. Reviewed-by: Mickaël Raulet <mraulet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-22 14:57:37 +02:00
Christophe Gisquet	b9f3912a65	hevc: move MAX_PB_SIZE declaration Reviewed-by: Mickaël Raulet <mraulet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-22 14:21:46 +02:00
Christophe Gisquet	fb1a98ec5b	x86: hevc_mc: assume 2nd source stride is 64 Reviewed-by: Mickaël Raulet <mraulet@gmail.com Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-22 13:21:37 +02:00
Janne Grunau	dc4b2e7d33	rv34: use ff_mpeg_update_thread_context only when decoder is fully initialized MpegEncContext based decoders are only fully initialized after the first ff_thread_get_buffer() call. The RV30/40 decoders may fail before a frame buffer was requested. ff_mpeg_update_thread_context() fails on half initialized MpegEncContexts. Since this can only happen before a the first frame was decoded there is no need to call ff_mpeg_update_thread_context(). Based on patches by John Stebbins and tested by John Stebbins. CC: libav-stable@libav.org	2014-08-22 13:11:43 +02:00
Christophe Gisquet	e32eddaa51	wavpackenc: make assert more thorough It was only validating that normal data wasn't filling the buffer. However, extra data may be written afterwards. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-22 12:30:10 +02:00
Christophe Gisquet	ddad093972	wavpackenc: fix number of samples per block Currently, the encoder will try to reduce it down to 150000, but the decoder will complain starting at 131072 (WV_MAX_SAMPLES). Therefore, change the loop limit. Fixes ticket #3881. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-22 12:18:08 +02: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	fccd85b9f3	avcodec: fix aac/ac3 parser bitstream buffer size Buffers containing copies of the AAC and AC3 header bits were not padded before parsing, violating init_get_bits() buffer padding requirement, leading to potential buffer read overflows. This change adds FF_INPUT_BUFFER_PADDING_SIZE bytes to the bit buffer for parsing the header in each of aac_parser.c and ac3_parser.c. Based on patch by: Matt Wolenetz <wolenetz@chromium.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-22 01:24:40 +02:00
Christophe Gisquet	b3d6543caf	dpxenc: fix padding in encode_gbrp12 It was added per pixel instead of per line. Reviewed-by: James Darnley <james.darnley@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-21 23:02:48 +02:00
Christophe Gisquet	0625a38066	hevc_ps: check overflow and test alternate syntax Some streams were found to have what appeared to be truncated SPS. Their syntax seem to be valid at least until the end of the VUI, so try that syntax if the parsing would overflow the SPS in the conforming syntax. Fixes ticket #3872. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-21 22:04:43 +02:00
James Almer	54ca4dd43b	x86/hevc_res_add: refactor ff_hevc_transform_add{16,32}_8 * Reduced xmm register count to 7 (As such they are now enabled for x86_32). * Removed four movdqa (affects the sse2 version only). * pxor is now used to clear m0 only once. ~5% faster. Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>	2014-08-21 15:01:33 -03:00
Christophe Gisquet	4a5cc34b46	wavpackenc: assert on too small buffer bytestream2_* will not cause buffer overflow, but in that case, this means the allocation would be incorrect and the encoded result invalid. Therefore, assert no overflow occurred. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-21 17:59:06 +02:00
Christophe Gisquet	4728cdd880	imc: reject files with unfathomable sampling rates With huge sampling rates, the table derivation method does not converge fast enough. While fixing it using e.g. Newton-Rhapson-like methods (the curve is nicely convex) is possible, it is much simpler to reject these cases. The value of 96000 was arbitrarily chosen as a realistic value, though 1000000 would still work and converge. Fixes ticket #3868. Suggested-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-21 14:20:46 +02:00
Diego Biurrun	8fc6a70c21	mpeg12enc: Add missing #include for PICT_FRAME	2014-08-21 04:18:23 -07:00
Diego Biurrun	7cb66ebc0b	error_resilience: Drop asserts from guess_mv() The asserts check struct members that are not referenced in guess_mv() and one of them fails to compile.	2014-08-21 04:18:23 -07:00
Christophe Gisquet	331b1f7d81	huffyuvdec: fix old (v1) rgba Commit `deadcf5e` misplaced a hunk. Fixes ticket #3877. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-21 02:19:55 +02:00
James Almer	76a99d467f	x86/hecv_res_add: add ff_hevc_transform_add{8,16,32}_8_avx ~15% faster than sse2 Reviewed-by: Mickaël Raulet <mraulet@gmail.com> Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>	2014-08-20 16:54:52 -03:00
Michael Niedermayer	7caacc50ae	avcodec/hevc_ps: do cleanup in case of unsupported bit depth Fixes memleak Fixes CID1231989 Reviewed-by: Timothy Gu <timothygu99@gmail.com> Reviewed-by: Mickaël Raulet <mraulet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-20 15:14:53 +02:00
James Almer	9f498f4e6f	x86/hevc_res_add: fix register count in hevc_transform_add{16,32}_10_avx2 Signed-off-by: James Almer <jamrial@gmail.com>	2014-08-19 21:34:52 -03:00
Pierre Edouard Lepere	a6af4bf64d	x86: hevc: adding transform_add Reviewed-by: James Almer <jamrial@gmail.com> Approved-by: Ronald S. Bultje Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-20 01:28:56 +02:00
James Almer	201a511bb9	lavc/tiff: add support for YUV deflate Signed-off-by: James Almer <jamrial@gmail.com>	2014-08-19 18:48:39 -03:00
James Almer	b4231b4fed	lavc/tiff: move unpack_yuv() above the deflate functions Signed-off-by: James Almer <jamrial@gmail.com>	2014-08-19 18:48:31 -03:00
Jon Morley	18e70006e7	avcodec/adpcm: Fix incorrect AVSampleFormat for sample_fmts_s16p The AVSampleFormat list of sample_fmts_s16p is missing the trailing "P" for planar formats. AV_SAMPLE_FMT_S16 vs AV_SAMPLE_FMT_S16P Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-19 23:09:16 +02:00
Michael Niedermayer	f0c0ae37c6	avcodec/tiff: Check that pix_fmt is a yuv variant for TIFF_PHOTOMETRIC_YCBCR Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-19 21:09:07 +02:00
Michael Niedermayer	6ea69a8ffa	avcodec/tiff: do not use photometric to detect pix_fmt They should match but they do not always Fixes assertion failure no testcase with unmodified source available Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-19 21:09:07 +02:00
Christophe Gisquet	2ba58bec20	wavpackenc: proper buffer allocation The allocation didn't account for headers, that can be easily 79 bytes. As a result, buffers allocated for a few samples (e.g. 5 in the original bug) could be undersized. Fixed ticket #2881. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-19 18:04:25 +02:00
Christophe Gisquet	11a39bdf53	wavpack: report if there is no bits left Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-19 17:47:46 +02:00
Paul B Mahol	9a07c15f48	avcodec/pafaudio: use paf.h instead Signed-off-by: Paul B Mahol <onemda@gmail.com>	2014-08-19 13:35:44 +00:00
Paul B Mahol	02dc75f218	avcodec/pafvideo: remove unused header Signed-off-by: Paul B Mahol <onemda@gmail.com>	2014-08-19 13:35:02 +00:00
Diego Biurrun	6af2930222	pcm: Drop av_unused attribute from variable that is always used	2014-08-19 06:22:08 -07:00
Diego Biurrun	14d2006ca6	pcm: Drop unused variable from DECODE_PLANAR macro	2014-08-19 06:22:07 -07:00
Diego Biurrun	d456baafb6	vc1: Add missing parentheses to conditions in vc1_decode_b_mb_intfr()	2014-08-19 06:22:07 -07:00
Michael Niedermayer	f0e51be8d0	avcodec/proresenc_kostya: allocate 1 slice more to avoid triggering the reallocation warning when the used space is actually less than the allocated Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-19 14:04:50 +02:00
Michael Niedermayer	76a8cb9d7b	avcodec/proresenc_kostya: set initial max_slice_size based on frame_size_upper_bound If the initial max_slice_size is 0 then reallocation is disabled for the first slice. Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-19 14:04:30 +02:00
Christophe Gisquet	1467780772	huffyuvenc: add a non-deterministic option Not actually used in huffyuvenc, but rather in setting the frame threading. Example for some files: context=0: 851974 27226 1137281 context=1,ND=0: 471819 22604 972351 context=1,ND=1: 472875 22673 972582 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-19 13:47:18 +02:00
Christophe Gisquet	30cac8313a	alac: add option to decoded incorrect ALAC Prior to 56.1.100, incorrect ALAC files for 24bps content were produced, in particular not decoding losslessly. Add an option to allow correctly decoding those streams. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-18 21:59:23 +02:00
Michael Niedermayer	cdd0ad7be1	Merge commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51' * commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51': proresenc: Properly account for alpha plane Conflicts: libavcodec/proresenc_kostya.c See: `117bc8e6ff` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-18 20:27:41 +02:00
Michael Niedermayer	e348a81a66	Merge commit '45ce880a9b3e50cfa088f111dffaf8685bd7bc6b' * commit '45ce880a9b3e50cfa088f111dffaf8685bd7bc6b': proresenc: Realloc if buffer is too small Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-18 20:21:02 +02:00
Michael Niedermayer	e8a2f8cc12	Merge commit '58b68e4fdea22e22178e237bda950b09cc6f363a' * commit '58b68e4fdea22e22178e237bda950b09cc6f363a': proresenc: Report buffer overflow Conflicts: libavcodec/proresenc_kostya.c See: `52b81ff463` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-18 20:11:31 +02:00
Michael Niedermayer	43b769b0c4	Merge commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421' * commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421': proresenc: Remove unneeded parameters from encode_alpha_plane() Conflicts: libavcodec/proresenc_kostya.c See: `bf10f09bcc` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-18 20:01:14 +02:00
Michael Niedermayer	3f0c76e262	Merge commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0' * commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0': tiff: Return proper error for missing LZMA compression Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-18 19:52:22 +02:00
Christophe Gisquet	41e1354c10	proresenc: Properly account for alpha plane The packet buffer allocation considers the alpha channel as DCT-coded, while it is actually run-coded and thus requires a larger buffer. CC: libav-stable@libav.org Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-08-18 18:58:01 +02:00
Christophe Gisquet	45ce880a9b	proresenc: Realloc if buffer is too small The buffer allocation may be incorrect (e.g. with an alpha plane), and currently causes the buffer to be set to NULL by init_put_bits, causing a crash later on. So, detect that situation, and if detected, reallocate the buffer and ask for a sample that shows the problem. CC: libav-stable@libav.org Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-08-18 18:57:06 +02:00
Christophe Gisquet	58b68e4fde	proresenc: Report buffer overflow If the allocated size, despite best efforts, is too small, exit with the appropriate error. CC: libav-stable@libav.org Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-08-18 18:51:44 +02:00
Christophe Gisquet	b16699f2da	proresenc: Remove unneeded parameters from encode_alpha_plane() Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-08-18 18:48:14 +02:00
Diego Elio Pettenò	12640e4cbb	tiff: Return proper error for missing LZMA compression The LZMA support is a semi-official extension supported by libtiff 4.0.0 and later. Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-08-18 14:23:24 +02:00
Clément Bœsch	b0352b1997	avcodec: export motion vectors in frame side data on demand The reasoning behind this addition is that various third party applications are interested in getting some motion information out of a video "for free" when it is available. It was considered to export other information as well (such as the intra information about the block, or the quantization) but the structure might have ended up into a half full-generic, half full of codec specific cruft. If more information is necessary, it should either be added in the "flags" field of the AVMotionVector structure, or in another side-data. This commit also includes an example exporting them in a CSV stream.	2014-08-18 14:13:57 +02:00
Christophe Gisquet	4ddb3a6df0	gifdec: use truncated width for image manipulation Some files seem to have an off-by-one error. In most cases, it appears to be on the image width. Therefore, if the decoded image doesn't fit in the screen: - If it is wider than the screen (and the lzw decoding buffer), reject it; - Otherwise, decode the indicated amount, but only write a truncated amount to the screen. Fixes ticket #3538. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-18 09:49:01 +02:00
Christophe Gisquet	96d2178325	alacenc: fix extra bits extraction The raw coded bits are extracted prior to decorrelation, as is correctly performed by the decoder, and not after. Fixes ticket #2768. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-18 02:51:34 +02:00
Christophe Gisquet	c0d18cc085	alacenc: increase predictor buffer This change is almost cosmetical only, and reduces the changes needed to fix the 24bps case. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-18 02:50:20 +02:00
Piotr Bandurski	a3329a09f9	avcodec/lcldec: fix decoding of YUV444 sample Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-17 18:53:06 +02:00
Michael Niedermayer	94f60b6544	avcodec/h264_mb: fix grayscale only decoding with weighted prediction Fixes Ticket3412 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-17 15:00:16 +02:00
Michael Niedermayer	b6c9266722	avcodec/rpza: fix +- error Fixes Ticket3471 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-17 14:39:43 +02:00
Michael Niedermayer	afe23e430e	vcodec/rpza: print mismatching size in case of error Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-17 14:30:06 +02:00
Michael Niedermayer	e7f3b507a3	avcodec/mips/compute_antialias_float: remove unused variable Reviewed-by: James Darnley <james.darnley@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-16 15:58:41 +02:00
Michael Niedermayer	97bb456b6b	avcodec/hevc_mvs: dont redundantly initialize ref_idx_curr Reviewed-by: James Darnley <james.darnley@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-16 15:58:40 +02:00
Michael Niedermayer	0014541e9a	avcodec/dvbsubdec: dont mix integers with pointers Reviewed-by: James Darnley <james.darnley@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-16 15:58:40 +02:00
Michael Niedermayer	2d7cec14be	avcodec/dvdsubdec: Dont mix integers with pointers Reviewed-by: James Darnley <james.darnley@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-16 15:58:40 +02:00
Michael Niedermayer	81a663f49e	Drop remaining unneeded != NULL Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-15 22:47:45 +02:00
Michael Niedermayer	60dbed6067	Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867' * commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867': cosmetics: Write NULL pointer inequality checks more compactly Conflicts: libavcodec/dvdsubdec.c libavcodec/h263dec.c libavcodec/libxvid.c libavcodec/rv10.c libavcodec/utils.c libavformat/format.c libavformat/matroskadec.c libavformat/segment.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-15 21:26:12 +02:00
Michael Niedermayer	fb33bff990	Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' * commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-15 21:00:50 +02:00
Michael Niedermayer	3bb2297351	Merge commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6' * commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6': build: Add explanatory comments to (optimization) blocks in the Makefiles Conflicts: libavcodec/ppc/Makefile libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-15 20:25:12 +02:00
Michael Niedermayer	c1df467d73	Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b' * commit '835f798c7d20bca89eb4f3593846251ad0d84e4b': mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes Conflicts: libavcodec/h261dec.c libavcodec/intrax8.c libavcodec/mjpegenc.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/x86/mpegvideoenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-15 20:11:56 +02:00
Gabriel Dume	4b1f5e5090	cosmetics: Write NULL pointer inequality checks more compactly Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-08-15 05:34:13 -07:00
Gabriel Dume	f929ab0569	cosmetics: Write NULL pointer equality checks more compactly Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-08-15 03:18:18 -07:00
Diego Biurrun	efd26bedec	build: Add explanatory comments to (optimization) blocks in the Makefiles	2014-08-15 02:55:21 -07:00
Diego Biurrun	835f798c7d	mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes	2014-08-15 01:26:33 -07:00
Michael Niedermayer	6c1ee1a114	avcodec/h261dec: Fix context initialization sequence Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-15 02:53:48 +02:00
Michael Niedermayer	595c63357c	Merge commit '552bc42df48784ae3ce0d499ece5b33f3cc7576a' * commit '552bc42df48784ae3ce0d499ece5b33f3cc7576a': h261dec: Fix order of initialization Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-15 02:41:47 +02:00
Michael Niedermayer	012062cfd5	Merge commit 'b869eea7ea8f5d8331fcd6355f848bb6a6e06b14' * commit 'b869eea7ea8f5d8331fcd6355f848bb6a6e06b14': h263dec: Fix order of initialization Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-15 02:28:49 +02:00
Michael Niedermayer	2fd87a3d78	Merge commit '998c9f15d1ca8c7489775ebcca51623b915988f1' * commit '998c9f15d1ca8c7489775ebcca51623b915988f1': idct: remove call to ff_idctdsp_init from ff_MPV_common_init Conflicts: libavcodec/dnxhdenc.c libavcodec/h263dec.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-15 02:25:14 +02:00
James Darnley	7ce6c021dc	lavc/flacdsp: change lpc_encoder function pointer prototype This should help to clarify the API. Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-14 20:11:35 +02:00
John Stebbins	552bc42df4	h261dec: Fix order of initialization ff_MPV_common_init requires the frame dimensions which get parsed in h261_decode_picture_header.	2014-08-14 07:58:50 -07:00
John Stebbins	b869eea7ea	h263dec: Fix order of initialization ff_MPV_common_init requires the frame dimensions which get parsed in *_decode_picture_header.	2014-08-14 07:58:50 -07:00
John Stebbins	998c9f15d1	idct: remove call to ff_idctdsp_init from ff_MPV_common_init One step in untangling the mpegvideo code and fixing some problems in the order that initialization is being done in h263dec and h261dec.	2014-08-14 07:58:49 -07:00
Michael Niedermayer	5c7899a483	avcodec/mjpegdec: Support AV_PIX_FMT_YUV420P16 with upscale_h Fixes assertion failure Fixes: test42f.jpg Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-14 16:20:55 +02:00
Christophe Gisquet	58d380f9a7	libavcodec: bump micro to reflect dpx changes The encoder produces files that are no longer compatible with previous versions of the decoder, and may actually cause decoding issues for other software, so indicate that change to allow decoder quirks. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-14 16:05:10 +02:00
Michael Niedermayer	6c36b3afe7	avcodec/lcldec: initialize encoded correctly Fixes out of array read Fixes: yuv111_no_compr_crash.avi Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-14 15:19:47 +02:00
Christophe Gisquet	117bc8e6ff	proresenc_kostya: properly account for alpha The packet buffer allocation considered as dct-coded, while it is actually run-coded and thus requires a larger buffer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-14 14:28:58 +02:00
Christophe Gisquet	4ba45c189c	dpx: use aligned line starts SMPTE 268M-2003 specifies that each line starts at a 4-bytes boundary. Therefore, modify correspondingly the input buffer strides and size. Partially fixes ticket #3692: DLAD_8b_3c_big.dpx still has inverted colors, which might be related to endianness. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-14 13:35:24 +02:00
Michael Niedermayer	b634c12cb9	Merge commit '93f29948e4b06acfb96e7f82d373ef86d6dc55f7' * commit '93f29948e4b06acfb96e7f82d373ef86d6dc55f7': mpeg4video: Fix doxygen comment syntax to document correct struct member Conflicts: libavcodec/mpeg4video.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-14 12:50:40 +02:00
Nidhi Makhijani	93f29948e4	mpeg4video: Fix doxygen comment syntax to document correct struct member Also fix some comment typos. Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-08-14 11:59:59 +02:00
Edgar Hucek	ab059f0aa8	vaapi: set the scaling list correctly. Fixes VAAPI decoding artefacts. CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-08-14 05:50:08 +00:00
Christophe Gisquet	7cdef77b50	dpx: warn if encrypted Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-14 04:31:07 +02:00
Christophe Gisquet	69849a2d6e	dpxenc: enforce alignment requirement S268M-2003 specifies that each line start is aligned on a 4-byte boundary. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-14 04:24:14 +02:00
Michael Niedermayer	7b59217b60	Move WMA case from ff_get_audio_frame_size() to av_get_audio_frame_duration() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-14 03:03:56 +02:00
Michael Niedermayer	ed488d1535	Move frame_size fallback from ff_get_audio_frame_size() to av_get_audio_frame_duration() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-14 03:00:39 +02:00
Ronald S. Bultje	14e3025518	vp9: ignore reference segmentation map if error_resilience flag is set. Fixes ffvp9_fails_where_libvpx.succeeds.webm from ticket 3849. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-13 20:46:00 +02:00
James Almer	9f61d6d8fb	lavc/dnxhd: ff_dnxhd_cid_table is not exported Signed-off-by: James Almer <jamrial@gmail.com> Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-13 13:12:52 +02:00
James Darnley	0a52bbdc31	cvcodec/flacdsp_lpc_template: osmetic fix Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-13 05:01:35 +02:00
James Darnley	54a51d3840	lavc/flacenc: partially unroll loop in flac_enc_lpc_16 It now does 12 samples per iteration, up from 4. From 1.8 to 3.2 times faster again. 3.6 to 5.7 times faster overall. Runtime is reduced by a further 2 to 18%. Overall runtime reduced by 4 to 50%. Same conditions as before apply. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-13 03:09:26 +02:00
James Almer	a8592db9bb	avcodec/idctdsp: make add/put_pixels_clamped_c internal functions This reduces code duplication and differences with the fork. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-13 01:44:41 +02:00
James Darnley	0081a14e7d	lavc/flacenc: add sse4 version of the 16-bit lpc encoder From 1.8 to 2.4 times faster. Runtime is reduced by 2 to 39%. The speed-up generally increases with compression_level. This lpc encoder is not used with levels < 3 so it provides no speed-up in these cases. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-13 01:14:47 +02:00
Pascal Massimino	298b3b6c1f	avcodec: add C xvid IDCT support Thanks to Pascal Massimino and Michael Militzer for permission to use under LGPL The xvid idct code is from xvid, and nearly unchanged to make future syncing easy the integration into ffmpeg is done by the commiter the commit message is written by the commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-12 21:58:45 +02:00
Michael Niedermayer	113229922a	Merge commit 'da7d839a0d3ec40423a665dc85e0cfaed3f92eb8' * commit 'da7d839a0d3ec40423a665dc85e0cfaed3f92eb8': ffv1dec: check that global parameters do not change in version 0/1 Conflicts: libavcodec/ffv1dec.c See: `b05cd1ea7e` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-12 17:09:39 +02:00
Michael Niedermayer	17cbc6457b	Merge commit 'cf6090dc6252f2b276aa4133e3d73a89f4c6046c' * commit 'cf6090dc6252f2b276aa4133e3d73a89f4c6046c': hevc: use intreadwrite Conflicts: libavcodec/hevc_mvs.c See: `7a4a5515b0` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-12 16:39:58 +02:00
Michael Niedermayer	5195512add	Merge commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc' * commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc': hevc: derive partial merge list Conflicts: libavcodec/hevc_mvs.c See: `4576eff05d` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-12 16:27:39 +02:00
Michael Niedermayer	e6ffe7bcfc	Merge commit '09182b3224370e1d636631e77f201a8388766bd6' * commit '09182b3224370e1d636631e77f201a8388766bd6': hevc: simplify rounding Conflicts: libavcodec/hevc_mvs.c See: `2e471e4703` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-12 16:07:07 +02:00
Michael Niedermayer	2278146a0c	Merge commit 'd1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574' * commit 'd1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574': hevc: reorder loops Conflicts: libavcodec/hevc.c See: `eca1957c4c` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-12 15:59:33 +02:00
Ronald S. Bultje	45bed0ab30	vp9/x86: fix bug in intra_pred_hd_32x32. Fixes mismatch in first keyframe in sample ffvp9_fails_where_libvpx.succeeds.webm from ticket 3849. There's still a second mismatch a few frames into the sample. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-12 13:11:21 +02:00
James Almer	c97870d1a1	x86/dca: remove unused header Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-12 12:46:53 +02:00
James Almer	e20ff251a6	x86/ttadsp: remove an unnecessary mova Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-12 12:29:05 +02:00
Michael Niedermayer	da7d839a0d	ffv1dec: check that global parameters do not change in version 0/1 Such changes are neither allowed nor supported Found-by: ami_stuff Bug-Id: CVE-2013-7020 CC: libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-08-12 10:21:21 +00:00
Christophe Gisquet	3187fa14a3	hevc_mvs: avoid deriving tmvp in amvp Reduces the number of calls to tmvp derivation from 933685 to 586271 on a sequence. Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr> Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-08-12 10:13:43 +00:00
Christophe Gisquet	14ca0aa69b	hevc: wait proper position for tmvp The position is either rounded or not checked, so delay the wait to check the proper value. Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr> Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-08-12 10:13:21 +00:00
Christophe Gisquet	cf6090dc62	hevc: use intreadwrite When dealing with MVs, both components may be processed at a time. Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-08-12 10:03:20 +00:00
Christophe Gisquet	ed53cc217f	hevc: derive partial merge list The merge list only needs to be derived up to the merge index. Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-08-12 09:59:30 +00:00
Christophe Gisquet	3505b19652	hevc: derive partially amvp list When the candidate has been found, no need to derive others. Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-08-12 09:58:14 +00:00
Christophe Gisquet	09182b3224	hevc: simplify rounding Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-08-12 09:57:25 +00:00
Christophe Gisquet	d1b1c3bb5e	hevc: reorder loops iterate over memory in a more continuous order Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-08-12 09:57:05 +00:00
Christophe Gisquet	52b81ff463	proresenc_kostya: report buffer overflow If the allocated size, despite best efforts, is too small, exit with the appropriate error. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-12 00:46:37 +02:00
Christophe Gisquet	bf10f09bcc	proresenc_kostya: remove unneeded parameters Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-12 00:46:37 +02:00
Michael Niedermayer	9a162146ca	avcodec/snow: fix null pointer dereference in cleanup after allocation failure Fixes: snowf.avi Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-11 15:37:15 +02:00
Michael Niedermayer	ba47d519e5	avcodec/huffyuvdec: fix overread checks Fixes: ffvhuff_f.avi Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-11 15:17:11 +02:00
Michael Niedermayer	11512d70fa	avcodec/get_bits: add BITS_LEFT() for finding the bits left with an opened reader Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-11 15:15:54 +02:00
James Almer	59ecd4882d	lavc/raw: remove obsolete ff_raw_pix_fmt_tags cruft Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-11 13:46:23 +02:00
James Almer	8f2634f970	lavc: stop exporting internal functions and tables Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-11 13:23:48 +02:00
Michael Niedermayer	9eda4e8bd7	avcodec/idctdsp: move add/put_pixels_clamped_c to header This allows sharing them with the xvid IDCT Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-11 13:08:46 +02:00
Christophe Gisquet	5ec85c9750	hevc: do generic validation of bitstream After finishing parsing VPS/SPS/PPS/slice header, check remaining bits, and if an overconsumption occurred, report invalid data. Liked-by: BBB Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-11 02:47:05 +02:00
Ronald S. Bultje	bfffce4d08	hevc: add missing comma in log message. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-11 02:27:27 +02:00
Michael Niedermayer	6801eb0a09	avcodec/vc1dec: do not crash when flushing without an allocated frame Fixes Ticket3837 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-11 02:16:43 +02:00
Michael Niedermayer	d177f27517	Merge commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94' * commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94': avcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bump Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-10 23:41:51 +02:00
Michael Niedermayer	3539d6c63a	avcodec/iff: check pixfmt for rgb8 / rgbn Fixes out of array access Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-10 22:05:55 +02:00
Michael Niedermayer	9bcdb98839	avcodec/iff: Factorize av_pix_fmt_desc_get() out Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-10 21:53:39 +02:00
Michael Niedermayer	bd87965247	Merge commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e' * commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e': lavc: drop the av_fast_{re,m}alloc compatibility wrappers Conflicts: libavcodec/utils.c See: `a973e01501` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-10 20:51:15 +02:00
Diego Biurrun	cc1d8c54c1	avcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bump	2014-08-10 10:41:55 -07:00
Michael Niedermayer	61b9ce00a3	Merge commit '2597a842a0a2c7e8aa76f32733d27bf64817ae86' * commit '2597a842a0a2c7e8aa76f32733d27bf64817ae86': tiff: Improve grayscale support Conflicts: libavcodec/tiff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-10 18:40:46 +02:00
Christophe Gisquet	0d0d24af01	hevc_ps: verify P/T/L information This makes the SPS parsing a little, but barely, safer. Reviewed-by: Mickaël Raulet <mraulet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-10 18:05:33 +02:00
Anton Khirnov	d63443b968	lavc: drop the av_fast_{re,m}alloc compatibility wrappers They were only needed until the bump.	2014-08-10 15:40:38 +00:00
Michael Niedermayer	07262c7199	avcodec/options_table: leave xvidmmx AVOption in place Also mark it as deprecated through its help text Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-10 17:30:27 +02:00
Christophe Gisquet	84bc45880a	hevc_mvs: set candidate availabilities They might be left uninitialized otherwise since `3ad04608`. Fixes ticket #3840. Found-by: Carl Eugen Hoyos <ce@hoyos.ws> Reported-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-10 17:13:18 +02:00
Derek Buitenhuis	43654a22c0	Revert "lavc/utils: Do not require dimensions for PNG." mplayer-specifc hacks should not be in our codebase. mplayer should fix its own code. It is not our responsibility to work around their broken code. This reverts commit `e8e575633f`. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>	2014-08-10 15:58:13 +01:00
Diego Elio Pettenò	2597a842a0	tiff: Improve grayscale support Only use PAL8 if palette is present, else use GRAY8 for pixfmt. Instead of simulating a grayscale palette, use real grayscale pixels, if no palette is actually defined. Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-08-10 15:21:44 +02:00
Christophe Gisquet	7117547298	hevc: fix incorrect sao buffer size It previously used the output, cropped size, causing overreads/writes. Fixes ticket #3839. This issue was introduced by `d249e682`, which is not part of any release Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-10 12:34:57 +02:00
Michael Niedermayer	a71fcfad89	Merge commit '9325d88eba8038b3e2a4485e473a018410379e2d' * commit '9325d88eba8038b3e2a4485e473a018410379e2d': lavc: remove obsolete and disabled avpriv functions Conflicts: libavcodec/dv_profile.c libavcodec/dv_profile.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-10 02:09:13 +02:00
Michael Niedermayer	a973e01501	avcodec: disable FF_API_FAST_MALLOC It causes build failures in some cases and the functions are provided by libavutil so the wraper should not be needed anymore Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-10 01:53:10 +02:00
Michael Niedermayer	287602f9d8	Merge commit '472f9ed312ec784f7c72876b77163f4741880d05' * commit '472f9ed312ec784f7c72876b77163f4741880d05': Remove obsolete FF_API_AVFRAME_COLORSPACE cruft. Conflicts: libavcodec/utils.c libavutil/frame.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-10 01:29:24 +02:00
Michael Niedermayer	65cb02e87a	avcodec/version: delay removial of FF_API_AUDIO_CONVERT/FF_API_AVCODEC_RESAMPLE Some applications still use this deprecated API Its not nice to remove it when its still in use and as long as it doesnt cause us any work to keep it. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-10 00:38:48 +02:00
Michael Niedermayer	a57ece0cb4	Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8' * commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8': Bump major versions of all libraries. Conflicts: doc/APIchanges libavcodec/version.h libavdevice/version.h libavfilter/version.h libavformat/version.h libavutil/version.h libswscale/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-10 00:26:45 +02:00
Michael Niedermayer	80c1cb522c	avcodec/version: leave old audio API If people prefer we can also drop it Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-10 00:21:56 +02:00
Michael Niedermayer	6fac482624	avcodec/flacdec: fix handling of av_samples_fill_arrays() return value Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-10 00:21:55 +02:00
Michael Niedermayer	70b8668fb5	drop LLS1, rename LLS2 to LLS Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-09 23:20:31 +02:00
Michael Niedermayer	c89afc9acf	delay removial of FF_API_CODEC_ID, FF_API_OLD_AVOPTIONS and FF_API_OLD_ENCODE_VIDEO This prevents a build failure when bumping. the uses could easily be updated / removed, if people prefer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-09 23:19:16 +02:00
Michael Niedermayer	889cb3ae23	avcodec: remove deprecated use of FF_IDCT_XVIDMMX Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit eedc3f36532e4c6de782fe1c2dc59d192418a8fc) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-09 22:45:57 +02:00
Michael Niedermayer	3e41d2e612	Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e' * commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e': Postpone API-incompatible changes until the next bump. Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-09 22:19:45 +02:00
Michael Niedermayer	499ff6a052	Merge commit '7acdd3a1275bcd9cad48f9632169f6bbaeb39d84' * commit '7acdd3a1275bcd9cad48f9632169f6bbaeb39d84': hevc_filter: avoid excessive calls to ff_hevc_get_ref_list() Conflicts: libavcodec/hevc_filter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-09 21:49:55 +02:00
Michael Niedermayer	8d7c4cc082	Merge commit 'a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4' * commit 'a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4': hevc_filter: move some conditions out of loops Conflicts: libavcodec/hevc_filter.c This is possibly less readable than the variant used before. Thus please take a look and if people agree its worse, dont hesitate to revert. See: `83976e40e8` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-09 21:29:33 +02:00
Michael Niedermayer	3f2495d98c	Merge commit '70211539a39ca3854f8a9e97d51dc27caa079943' * commit '70211539a39ca3854f8a9e97d51dc27caa079943': hevc: deobfuscate slice/tile boundary handling for DBF Conflicts: libavcodec/hevc.c libavcodec/hevc_filter.c See: `a5c621aa85` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-09 21:01:55 +02:00
Anton Khirnov	9325d88eba	lavc: remove obsolete and disabled avpriv functions	2014-08-09 16:59:34 +00:00
Anton Khirnov	472f9ed312	Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.	2014-08-09 16:59:13 +00:00
Anton Khirnov	1985c2e75c	Bump major versions of all libraries.	2014-08-09 16:58:33 +00:00
Anton Khirnov	f4c444e17d	Postpone API-incompatible changes until the next bump.	2014-08-09 16:57:10 +00:00
Anton Khirnov	7acdd3a127	hevc_filter: avoid excessive calls to ff_hevc_get_ref_list() 1) each of the loops run within a single CTB, so the relevant reference list is constant 2) when that CTB is, or lies on the same slice as, the current one, we can use a simple access instead of a relatively expensive call to ff_hevc_get_ref_list()	2014-08-09 16:15:51 +00:00
Anton Khirnov	52a2c17ec0	hevc_refs: drop the handling of negative coordinates in ff_hevc_get_ref_list() It makes no sense and cannot happen in any place from which this function is called.	2014-08-09 16:15:38 +00:00
Anton Khirnov	a7a17e3f19	hevc_filter: move some conditions out of loops	2014-08-09 16:15:11 +00:00
Anton Khirnov	70211539a3	hevc: deobfuscate slice/tile boundary handling for DBF Use named constants instead of magic numbers, avoid using variables with inverse meaning from what their name implies.	2014-08-09 16:13:48 +00:00
Anton Khirnov	5501971578	hevc_filter: drop more redundant checks The if() around those loops ensures this condition is always false.	2014-08-09 16:13:37 +00:00
Anton Khirnov	65b8b6c476	hevc_filter: drop redundant checks ff_hevc_deblocking_boundary_strengths() is never called if the deblocking filter is disabled for the slice.	2014-08-09 16:13:24 +00:00
Anton Khirnov	4d1ff2a489	hevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled	2014-08-09 16:13:11 +00:00
Michael Niedermayer	25eeff9600	avcodec/avdct: add "xvid" alias AVOption and use FF_IDCT_XVID Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-09 12:42:07 +02:00
Michael Niedermayer	3841f2ae66	Merge commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36' * commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36': avcodec: Rename xvidmmx IDCT to xvid Conflicts: doc/APIchanges libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-09 12:11:13 +02:00
Michael Niedermayer	0dcebb9f63	Merge commit '84d173d3de97c753234ab0c0b50551d51413d663' * commit '84d173d3de97c753234ab0c0b50551d51413d663': xvididct: Ensure that the scantable permutation is always set correctly Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-08 22:17:04 +02:00
Michael Niedermayer	5ff2b33401	Merge commit '6f1960ab71b4f18551243ce22d01913108265233' * commit '6f1960ab71b4f18551243ce22d01913108265233': idct: cosmetics: Drop one unnecessary if-block level Conflicts: libavcodec/idctdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-08 21:53:20 +02:00
Diego Biurrun	d35b94fbab	avcodec: Rename xvidmmx IDCT to xvid The Xvid IDCT is not MMX-specific.	2014-08-08 11:13:30 -07:00
Diego Biurrun	84d173d3de	xvididct: Ensure that the scantable permutation is always set correctly This fixes cases where the scantable permuation would get overwritten by the general idctdsp initialization.	2014-08-08 11:13:29 -07:00
Diego Biurrun	6f1960ab71	idct: cosmetics: Drop one unnecessary if-block level	2014-08-08 11:13:29 -07:00
Michael Niedermayer	a561662fb7	Merge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d' * commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d': avcodec: Undeprecate reordered_opaque Conflicts: doc/APIchanges libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-07 20:43:11 +02:00
Michael Niedermayer	2bf87dcc2d	Merge commit 'a7e541c9926d531a100ba0d36f4e56956dd84651' * commit 'a7e541c9926d531a100ba0d36f4e56956dd84651': h264: fix interpretation of interleved stereo modes Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-07 20:22:16 +02:00
James Almer	dd2b0c1cde	lavc: remove nonexistent functions from the version file Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-07 13:20:59 +02:00
Diego Biurrun	ad1ee5fa75	avcodec: Undeprecate reordered_opaque It allows attaching other external, opaque data to the frame and passing it through the reordering process, for cases when the caller wants other data than just the plain packet pts. There is no way to cleanly achieve this without the field.	2014-08-07 04:03:00 -07:00
James Almer	0ab00a75e4	avcodec/raw: add avpriv_get_raw_pix_fmt_tags() Used to expose ff_raw_pix_fmt_tags[] to other libav* libraries Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-07 12:52:38 +02:00
Felix Abecassis	a7e541c992	h264: fix interpretation of interleved stereo modes Column and row frame packing arrangements were inverted. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>	2014-08-07 11:31:47 +01:00
Michael Niedermayer	4213fc5b9e	avcodec/svq1dec: Fix multiple bugs from "svq1: do not modify the input packet" Add padding, clear size, use the correct pointer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-07 02:27:07 +02:00
Michael Niedermayer	e55e09949e	Merge commit '7b588bb691644e1b3c168b99accf74248a24e3cf' * commit '7b588bb691644e1b3c168b99accf74248a24e3cf': svq1: do not modify the input packet Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-07 02:08:56 +02:00
Michael Niedermayer	c628627995	Merge commit 'c7d9b473e28238d4a4ef1b7e8b42c1cca256da36' * commit 'c7d9b473e28238d4a4ef1b7e8b42c1cca256da36': cdgraphics: do not return 0 from the decode function Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-07 01:56:50 +02:00
Michael Niedermayer	91b4ed0918	Merge commit 'a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812' * commit 'a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812': cdgraphics: switch to bytestream2 Conflicts: libavcodec/cdgraphics.c See: `ad002e1a13` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-07 01:45:22 +02:00
James Almer	8dfb8190d7	libavcodec/rawdec: remove old ff_find_pix_fmt() function It's been dead code for more than a year Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-07 00:44:07 +02:00
Michael Niedermayer	7a34b7d80f	avcodec/dca: Make ff_dca_convert_bitstream() available to libavformat, needed for dts_probe() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-06 22:28:35 +02:00
Anton Khirnov	7b588bb691	svq1: do not modify the input packet The input data must remain constant, make a copy instead. This is in theory a performance hit, but since I failed to find any samples using this feature, this should not matter in practice. Also, check the size of the header, avoiding invalid reads on truncated data. CC:libav-stable@libav.org	2014-08-06 18:59:27 +00:00
Anton Khirnov	c7d9b473e2	cdgraphics: do not return 0 from the decode function 0 means no data consumed, so it can trigger an infinite loop in the caller. CC:libav-stable@libav.org	2014-08-06 18:32:42 +00:00
Anton Khirnov	a1599f3f7e	cdgraphics: switch to bytestream2 Fixes possible invalid memory accesses on corrupted data. CC:libav-stable@libav.org Bug-ID: CVE-2013-3674	2014-08-06 18:32:38 +00:00
Christophe Gisquet	75837e9add	x86: sbrdsp/fft: reuse ps_neg constant Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-06 19:25:08 +02:00
Christophe Gisquet	51dd80e751	x86: diracdsp: reuse constants Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-06 19:25:02 +02:00
Christophe Gisquet	6622a6cff3	x86: dwt: better share constants Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-06 19:24:57 +02:00
Christophe Gisquet	71db2d08b1	x86: better share ff_pw_2 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-06 19:24:49 +02:00
Christophe Gisquet	4e128ab0b1	x86: vpx/h264/hevc/mpeg2: share constants Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-06 18:36:31 +02:00
Michael Niedermayer	305f72aee7	avcodec: Change get_pixels() to ptrdiff_t linesize Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-06 15:50:54 +02:00
Vittorio Giovara	cbc808d726	jpeg2000: enable 4 component pixel formats Bug-Id: 721 CC: libav-stable@libav.org Sample-Id: 31230.mov	2014-08-06 12:23:21 +01:00
Christophe Gisquet	6786848585	hevc_deblock: change tc type The x86 asm expects int32_t so use that type. Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-06 12:38:26 +02:00
Michael Niedermayer	296b01d7f9	Merge commit 'a7153444df9040bf6ae103e0bbf6104b66f974cb' * commit 'a7153444df9040bf6ae103e0bbf6104b66f974cb': huffyuvdec: check width size for yuv422p Conflicts: libavcodec/huffyuvdec.c See: `6abb9a901f` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-06 00:08:03 +02:00
Michael Niedermayer	a7153444df	huffyuvdec: check width size for yuv422p Avoid out of array accesses. CC: libav-stable@libav.org Bug-Id: CVE-2013-0848 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-08-05 20:01:59 +00:00
Michael Niedermayer	70cd3b8e65	mmvideo: check horizontal coordinate too Fixes out of array accesses. Bug-Id: CVE-2013-3672 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-08-05 19:16:12 +00:00
Michael Niedermayer	849b9d34c7	wmalosslessdec: fix mclms_coeffs* array size Fixes corruption of context Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org Bug-Id: CVE-2014-2098 Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-08-05 14:58:03 +00:00
Michael Niedermayer	9988899993	Merge commit '701e8b42e12ad625c64ceae2252acb1de390278c' * commit '701e8b42e12ad625c64ceae2252acb1de390278c': vc-1: Optimise parser (with special attention to ARM) Conflicts: libavcodec/vc1_parser.c See: `a0d7f9ec9a` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-05 13:37:07 +02:00
Michael Niedermayer	bf7ed956ff	Merge commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed' * commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed': vc-1: Add platform-specific start code search routine to VC1DSPContext. Conflicts: configure libavcodec/arm/vc1dsp_init_arm.c libavcodec/vc1dsp.c libavcodec/vc1dsp.h See: `9d8ecdd8ca` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-05 13:00:41 +02:00
Michael Niedermayer	77aafadc56	Merge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8' * commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8': h264: Move start code search functions into separate source files. Conflicts: libavcodec/arm/Makefile libavcodec/arm/h264dsp_init_arm.c libavcodec/h264_parser.c libavcodec/h264dsp.c libavcodec/startcode.c libavcodec/startcode.h See: `270cede3f3` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-05 12:46:10 +02:00
James Almer	de417982e8	x86/vp9lpf: use fewer instructions in SPLATB_MIX Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-05 02:47:54 +02:00
Bernd Kuhls	bf6c84d7eb	Fix compile error on bfin. After the removal of all Blackfin architecture optimizations in http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b55d3bbeed375f7b74442c4dd274d116a3e3d2e1 some includes were left behind leading to a compile error: CC libavformat/adtsenc.o In file included from ./libavcodec/get_bits.h:35, from ./libavcodec/ac3_parser.h:27, from libavformat/ac3dec.c:23: ./libavcodec/mathops.h:43:29: error: bfin/mathops.h: No such file or directory This compile error was found by buildroot autobuild system: http://autobuild.buildroot.net/results/ae0/ae056f267e907091d09d2a1546d6f1ae02fa23b9/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-05 01:54:47 +02:00
Michael Niedermayer	debb88776c	Merge commit '990e2f3555bb0adae122d3599938ddcfee46e2d1' * commit '990e2f3555bb0adae122d3599938ddcfee46e2d1': avcodec: Suppress deprecation warnings from DTG code scheduled for removal Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-05 01:15:11 +02:00
Michael Niedermayer	8f83fb9991	Merge commit '60cbd6ad84de0931314030b81df87b69d6196587' * commit '60cbd6ad84de0931314030b81df87b69d6196587': tiff: support reading gray+alpha at 8 bits Conflicts: libavcodec/tiff.c See: `f746f37901` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-04 22:52:01 +02:00
Michael Niedermayer	47080b6d17	Merge commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab' * commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab': tiff: support reading gray+alpha at 16 bits Conflicts: libavcodec/tiff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-04 22:45:33 +02:00
Michael Niedermayer	59412e3a07	Merge commit 'e64f0bf2d2b1347ec9461f0e82852a62e8c6ffbe' * commit 'e64f0bf2d2b1347ec9461f0e82852a62e8c6ffbe': png: support reading gray+alpha at 16 bits Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-04 22:38:12 +02:00
Ben Avison	701e8b42e1	vc-1: Optimise parser (with special attention to ARM) The previous implementation of the parser made four passes over each input buffer (reduced to two if the container format already guaranteed the input buffer corresponded to frames, such as with MKV). But these buffers are often 200K in size, certainly enough to flush the data out of L1 cache, and for many CPUs, all the way out to main memory. The passes were: 1) locate frame boundaries (not needed for MKV etc) 2) copy the data into a contiguous block (not needed for MKV etc) 3) locate the start codes within each frame 4) unescape the data between start codes After this, the unescaped data was parsed to extract certain header fields, but because the unescape operation was so large, this was usually also effectively operating on uncached memory. Most of the unescaped data was simply thrown away and never processed further. Only step 2 - because it used memcpy - was using prefetch, making things even worse. This patch reorganises these steps so that, aside from the copying, the operations are performed in parallel, maximising cache utilisation. No more than the worst-case number of bytes needed for header parsing is unescaped. Most of the data is, in practice, only read in order to search for a start code, for which optimised implementations already existed in the H264 codec (notably the ARM version uses prefetch, so we end up doing both remaining passes at maximum speed). For MKV files, we know when we've found the last start code of interest in a given frame, so we are able to avoid doing even that one remaining pass for most of the buffer. In some use-cases (such as the Raspberry Pi) video decode is handled by the GPU, but the entire elementary stream is still fed through the parser to pick out certain elements of the header which are necessary to manage the decode process. As you might expect, in these cases, the performance of the parser is significant. To measure parser performance, I used the same VC-1 elementary stream in either an MPEG-2 transport stream or a MKV file, and fed it through avconv with -c:v copy -c:a copy -f null. These are the gperftools counts for those streams, both filtered to only include vc1_parse() and its callees, and unfiltered (to include the whole binary). Lower numbers are better: Before After File Filtered Mean StdDev Mean StdDev Confidence Change M2TS No 861.7 8.2 650.5 8.1 100.0% +32.5% MKV No 868.9 7.4 731.7 9.0 100.0% +18.8% M2TS Yes 250.0 11.2 27.2 3.4 100.0% +817.9% MKV Yes 149.0 12.8 1.7 0.8 100.0% +8526.3% Yes, that last case shows vc1_parse() running 86 times faster! The M2TS case does show a larger absolute improvement though, since it was worse to begin with. This patch has been tested with the FATE suite (albeit on x86 for speed). Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-08-04 22:22:54 +02:00
Ben Avison	adf8227cf4	vc-1: Add platform-specific start code search routine to VC1DSPContext. Initialise VC1DSPContext for parser as well as for decoder. Note, the VC-1 code doesn't actually use the function pointer yet. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-08-04 22:22:54 +02:00
Ben Avison	db7f1c7c5a	h264: Move start code search functions into separate source files. This permits re-use with parsers for codecs which use similar start codes. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-08-04 22:22:54 +02:00
Michael Niedermayer	4c8bc6fdee	Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5' * commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5': avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8 Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/raw.c libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h libswscale/swscale_internal.h libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-04 21:48:00 +02:00
Diego Biurrun	990e2f3555	avcodec: Suppress deprecation warnings from DTG code scheduled for removal	2014-08-04 11:08:35 -07:00
Christophe Gisquet	e8c003edd2	x86: hevc_deblock: remove unnecessary masking The unpacks/shuffles later on makes it unnecessary. Before: 1508 decicycles in h, 2096759 runs, 393 skips 2512 decicycles in v, 2095422 runs, 1730 skips After: 1477 decicycles in h, 2096745 runs, 407 skips 2484 decicycles in v, 2095297 runs, 1855 skips Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-04 17:46:04 +02:00
James Almer	b7863c972c	x86/hevc_mc: use fewer instructions in hevc_put_hevc_{uni, bi}_w[24]_{8, 10, 12} Signed-off-by: James Almer <jamrial@gmail.com> Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-04 14:47:15 +02:00
James Almer	b1a44e6bf5	x86/hevc_mc: remove an unnecessary pxor Signed-off-by: James Almer <jamrial@gmail.com> Reviewed-by: Mickaël Raulet <mraulet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-08-04 14:35:08 +02:00

... 5 6 7 8 9 ...

30091 Commits