ffmpeg

Author	SHA1	Message	Date
Michael Niedermayer	a82f3de053	Merge commit '312daa15891dc7abb77a404fe927d5ee35c52a71' * commit '312daa15891dc7abb77a404fe927d5ee35c52a71': vp9: Use the correct upper bound for seg_id Conflicts: libavcodec/vp9.h libavcodec/vp9block.c Not merged, the value was correct before as far as i can see Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-21 23:37:04 +01:00
Luca Barbato	cd975d5658	hevc: Spin the mv_mpv_mode calls in a stand alone function Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-11-21 23:17:37 +01:00
Michael Niedermayer	ac967ad872	Merge commit 'd466d82faaf6e0e57a3a4be5e38e3902ef251ac3' * commit 'd466d82faaf6e0e57a3a4be5e38e3902ef251ac3': dvdsubdec: Do not leak on failure path Conflicts: libavcodec/dvdsubdec.c See: `7fa9f7ef1c` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-21 22:36:01 +01:00
Michael Niedermayer	018ce90284	avcodec/libspeexdec: more verbose error message Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-21 20:08:56 +01:00
Michael Niedermayer	d96d8e121f	avcodec/libspeexdec: support zygoaudio Fixes Ticket1873 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-21 20:08:05 +01:00
Michael Niedermayer	2ae2c60554	avcodec/vp6: Use av_freep(), avoid leaving stale pointers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-21 18:03:27 +01:00
Benoit Fouet	33acebd3cc	avcodec/pngdec: add APNG support. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-21 17:13:56 +01:00
Vittorio Giovara	1f80742f49	qdm2: avoid integer overflow CC: libav-stable@libav.org Bug-Id: CID 700555	2014-11-21 12:37:50 +00:00
Luca Barbato	312daa1589	vp9: Use the correct upper bound for seg_id And use a macro to make apparent why the value. Bug-Id: CID 1108595	2014-11-21 12:37:05 +00:00
Luca Barbato	d466d82faa	dvdsubdec: Do not leak on failure path CC: libav-stable@libav.org Bug-Id: CID 1198262	2014-11-21 12:36:19 +00:00
Vittorio Giovara	a42d5c861f	libtwolame: prevent a NULL pointer dereference CC: libav-stable@libav.org Bug-Id: CID 1250330 / CID 1250335	2014-11-21 12:27:07 +00:00
Martin Storsjö	aa8b39d999	lavc: Move the libtwolame encoder registration to the list for external libraries This makes sure the default behaviour of using the internal encoder stays the same regardless if libtwolame is enabled or not (as for any external library). This fixes fate-lavf-mpg if libav is built with libtwolame enabled. CC: libav-stable@libav.org Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>	2014-11-21 12:27:07 +00:00
Lukasz Marek	7d75a399a4	lavc/options: fix rc_eq leak rc_eq is an option, so it is copied by av_opt_copy(dest, src); above.	2014-11-21 01:19:53 +01:00
Michael Niedermayer	21ded9ce67	avcodec/imc: Use avpriv_float_dsp_alloc() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-20 22:46:44 +01:00
Michael Niedermayer	b054054c9b	avcodec/dcadec: Use avpriv_float_dsp_alloc() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-20 22:46:08 +01:00
Michael Niedermayer	9018bd1197	avcodec/atrac1: Use avpriv_float_dsp_alloc() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-20 22:30:48 +01:00
Michael Niedermayer	8bce5c8e74	avcodec/ac3dec: Use avpriv_float_dsp_alloc() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-20 22:30:48 +01:00
Michael Niedermayer	bab11fe7bf	avcodec/mpeg12dec: forward error codes Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-20 16:31:27 +01:00
Michael Niedermayer	1852b2a0f4	avcodec/mpeg12dec: Use more specific error codes Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-20 16:29:42 +01:00
Michael Niedermayer	0f8908aa1b	avcodec/mpeg12dec: do not fail on invalid frame_rate_index Fixes Ticket4073 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-20 15:09:42 +01:00
Michael Niedermayer	88b4c1a731	avcodec/mpeg12dec: Print error/warning messages on issues in mpeg1_decode_sequence() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-20 15:09:26 +01:00
Michael Niedermayer	4ffec6d933	avcodec/twinvq: Use av_freep() to avoid leaving stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-19 13:44:40 +01:00
Michael Niedermayer	b9792afad1	avcodec/tta: Use av_freep() to avoid leaving stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-19 13:44:39 +01:00
Michael Niedermayer	beec818d99	avcodec/truemotion2: Use av_freep() to avoid leaving stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-19 13:44:30 +01:00
Peter Hall	ea79dfbad3	avcodec/libvorbisenc: Give CODEC_CAP_SMALL_LAST_FRAME to libvorbis encoder. The libvorbis encoder already supports a small last frame, but the layer above doesn't know that because we didn't register the small last frame capability. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-18 20:23:08 +01:00
Vadim Kalinsky	d1d3904273	avcodec/options: Set AVCodecContext->codec upon initialization. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-18 18:46:30 +01:00
Michael Niedermayer	06d2742899	avcodec/nellymoser: Use avpriv_float_dsp_alloc() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-18 12:11:57 +01:00
Michael Niedermayer	bb5e148299	libavcodec/tiffenc: Use av_freep() avoid leaving stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-18 11:33:58 +01:00
Michael Niedermayer	98fbf8ef67	libavcodec/libxavs: Use av_freep() avoid leaving stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-18 11:33:41 +01:00
Michael Niedermayer	ade140eb73	libavcodec/libx264: Use av_freep() avoid leaving stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-18 11:33:00 +01:00
Michael Niedermayer	4243415741	avcodec/mjpegdec: Support some subsampled GBR variants Fixes Ticket4045 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-18 05:10:21 +01:00
Michael Niedermayer	9bb6e1175f	avcodec/internal: Add () to argument of FF_SIGNBIT() to ensure correct order or operations Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-18 03:42:40 +01:00
Michael Niedermayer	cdbebae444	Merge commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa' * commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa': lavc: fix bitshifts amount bigger than the type Conflicts: libavcodec/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-18 03:16:38 +01:00
Michael Niedermayer	8426edef4c	Merge commit '771656bd85416cd6308b11aed6f2c69a8db9c21b' * commit '771656bd85416cd6308b11aed6f2c69a8db9c21b': libvpxenc: clean memory on error Conflicts: libavcodec/libvpxenc.c See: `104b1d9e10` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-18 03:08:20 +01:00
Vittorio Giovara	85dc006b1a	lavc: fix bitshifts amount bigger than the type CC: libav-stable@libav.org Bug-Id: CID 1194387 / CID 1194389 / CID 1194393 / CID 1206638	2014-11-18 00:39:23 +01:00
Vittorio Giovara	771656bd85	libvpxenc: clean memory on error CC: libav-stable@libav.org Bug-Id: CID 733795	2014-11-18 00:38:56 +01:00
Michael Niedermayer	894d10332c	avcodec/lcldec: support rgb24 with width%4 != 0 Fixes Ticket1216 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-17 21:06:31 +01:00
Michael Niedermayer	91a9ae5b6b	Merge commit 'eac3ac1fe0774b65316852616b2672702dbc3f31' * commit 'eac3ac1fe0774b65316852616b2672702dbc3f31': hevc: eliminate an unneeded intermediate variable Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-17 12:13:09 +01:00
Michael Niedermayer	0d5af820f7	Merge commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc' * commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc': hevc: reduce variable scope Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-17 12:07:49 +01:00
Michael Niedermayer	c23d7de22e	Merge commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8' * commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8': hevc: further reduce code duplication in hls_prediction_unit() Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-17 12:01:47 +01:00
Michael Niedermayer	e078549421	Merge commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139' * commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139': hevc: reduce code duplication in hls_prediction_unit() Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-17 11:54:41 +01:00
Michael Niedermayer	30156eab6d	Merge commit 'de1f8ead8993512925a3ee6c7491473414419e55' * commit 'de1f8ead8993512925a3ee6c7491473414419e55': hevcdsp_template: templatize transquant_bypass Conflicts: libavcodec/hevcdsp_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-17 11:41:35 +01:00
Michael Niedermayer	c192be1968	Merge commit '16c01fb4347312b6d29a6498dad627665b96a20e' * commit '16c01fb4347312b6d29a6498dad627665b96a20e': hevc: remove an unused function parameter Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-17 11:30:41 +01:00
Michael Niedermayer	f1b20930f2	Merge commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e' * commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e': hevc: do not store rqt_root_cbf in the context Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-17 11:20:32 +01:00
Michael Niedermayer	7cbe1e0447	Merge commit '920bca3e2332dced9c78bd14cfc2ff138188bd57' * commit '920bca3e2332dced9c78bd14cfc2ff138188bd57': hevc: do not store pcm_flag in the context Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-17 11:06:13 +01:00
Anton Khirnov	eac3ac1fe0	hevc: eliminate an unneeded intermediate variable	2014-11-17 09:26:45 +01:00
Anton Khirnov	eb335f3c5c	hevc: reduce variable scope Also, collapse the array into a scalar, since only one value is needed at a time.	2014-11-17 09:26:45 +01:00
Anton Khirnov	8b573ddda7	hevc: remove superfluous assignments and checks	2014-11-17 09:26:45 +01:00
Anton Khirnov	84c0ece5fd	hevc: further reduce code duplication in hls_prediction_unit()	2014-11-17 09:25:15 +01:00
Anton Khirnov	a7b365ae19	hevc: reduce code duplication in hls_prediction_unit()	2014-11-17 09:25:12 +01:00
Anton Khirnov	de1f8ead89	hevcdsp_template: templatize transquant_bypass	2014-11-17 09:25:12 +01:00
Anton Khirnov	16c01fb434	hevc: remove an unused function parameter	2014-11-17 09:25:12 +01:00
Anton Khirnov	2c6a7f9348	hevc: do not store rqt_root_cbf in the context It does not need to be accessed outside of hls_coding_unit().	2014-11-17 09:25:12 +01:00
Anton Khirnov	920bca3e23	hevc: do not store pcm_flag in the context It does not need to be accessed outside of hls_coding_unit().	2014-11-17 09:25:12 +01:00
Anton Khirnov	84b9463984	hevc: remove a redundant line pred_mode is overwritten a few lines immediately below.	2014-11-17 09:25:12 +01:00
Michael Niedermayer	20bf91f832	avcodec/roqvideoenc: clear freed pointers Avoid leaving stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-16 23:48:38 +01:00
Michael Niedermayer	7ababb85f9	avcodec/snow: clear freed pointers Avoid leaving stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-16 23:48:38 +01:00
Michael Niedermayer	00672d2ce5	avcodec/rl2: clear freed pointers Avoid leaving stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-16 23:48:38 +01:00
Michael Niedermayer	374c907fb3	avcodec/vorbis_parser: Move vp check Fixes null pointer dereference Fixes CID1251347 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-16 18:06:03 +01:00
Michael Niedermayer	1de786777e	avcodec/dvdsubdec: Check all fseek()s return codes Fixes CID1254660 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-16 17:50:18 +01:00
Lukasz Marek	01974a58df	lavc/options: initialize pkt_timebase It's default in option_table.h is 0, but without this fix it is represented as 0/0. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>	2014-11-16 01:13:38 +01:00
Lukasz Marek	4a30277a59	lavc/options: set timecode_frame_start to -1 as option default Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>	2014-11-16 01:13:38 +01:00
Lukasz Marek	c544ffd2ae	lavc/options_table: add pixel_format and video_size options Adding these options simplify ffm format implementation based on AVOption API. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>	2014-11-16 01:13:38 +01:00
Lukasz Marek	c727006616	lavc/options_table: set min to -1 for timecode_frame_start timecode_frame_start is set to -1 in avcodec_get_context_defaults3() AVOptions API complains about it. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>	2014-11-16 01:13:38 +01:00
Michael Niedermayer	f3cba01cce	Merge commit 'c00365b46d464ce47716315c1801818d811bdb9a' * commit 'c00365b46d464ce47716315c1801818d811bdb9a': aarch64: Make the function pointer tables position independent Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-16 01:05:31 +01:00
Martin Storsjö	c00365b46d	aarch64: Make the function pointer tables position independent This allows running the code on android, where 64 bit binaries with text relocations aren't allowed to be loaded. Signed-off-by: Martin Storsjö <martin@martin.st>	2014-11-16 01:07:24 +02:00
Michael Niedermayer	bd7d8604bd	avcodec/nellymoserenc: update comment to match `5c805d69a4` Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-15 22:12:35 +01:00
Michael Niedermayer	89e705cd5c	Merge commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c' * commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c': dv: Drop a spurious check Conflicts: libavcodec/dvdec.c See: `5307fa00a4` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-15 19:11:14 +01:00
Michael Niedermayer	7d37e45f6b	avcodec/mpeg4video_parser: fix spurious extradata parse warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-15 17:30:44 +01:00
Michael Niedermayer	10411afdff	avcodec/mpeg4videodec: replace some return -1 by more specific error codes Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-15 17:24:36 +01:00
Michael Niedermayer	18fcdc0981	avcodec/mpeg4videodec: forward return code in ff_mpeg4_decode_picture_header() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-15 17:09:37 +01:00
Shin-ichi Toyama	12630fa821	avcodec/dvdsubdec: New option for obtaining global palette from .IFO file (experimental) Suggested-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-15 12:50:39 +01:00
Michael Niedermayer	2fa6d21124	on2avc: Fix out of array access CC: libav-stable@libav.org Bug-Id: CID 1206648	2014-11-15 12:50:05 +01:00
Luca Barbato	74d7db586a	dv: Drop a spurious check The buffer is always valid. Bug-Id: CID 700682	2014-11-15 12:49:37 +01:00
Michael Niedermayer	53ab7846ee	Merge commit 'd16ec1b6db25bc348b0d4800c9a0c9b7070e3710' * commit 'd16ec1b6db25bc348b0d4800c9a0c9b7070e3710': atrac3plus: always initialize refwaves The initialization is not needed, the array is never read before being written to. Its merged anyway for robustness in respect to future changes Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-15 02:17:54 +01:00
Michael Niedermayer	85929b9caa	avcodec/lpc: remove unneeded {} Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-15 02:08:20 +01:00
Michael Niedermayer	d4065a9f47	Merge commit '60e0ee7ca25bd3bea54043b0607efe4cd51acaf3' * commit '60e0ee7ca25bd3bea54043b0607efe4cd51acaf3': lpc: always initialize ref and err The initialization is not needed, its merged anyway as it might help suppressing warnings and might make the code more robust against future changes See: `c4a36b6f70` See: `0dd99628ea` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-15 02:05:25 +01:00
Michael Niedermayer	a5adeff457	Merge commit '3a6ddfb8745e4b306a5637927fb057f630345e2f' * commit '3a6ddfb8745e4b306a5637927fb057f630345e2f': exr: check return value Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-15 01:55:21 +01:00
Vittorio Giovara	d16ec1b6db	atrac3plus: always initialize refwaves CC: libav-stable@libav.org Bug-Id: CID 1163851	2014-11-14 20:26:32 +01:00
Vittorio Giovara	60e0ee7ca2	lpc: always initialize ref and err CC: libav-stable@libav.org Bug-Id: CID 29585 / CID 700759	2014-11-14 20:25:52 +01:00
Vittorio Giovara	3a6ddfb874	exr: check return value CC: libav-stable@libav.org Bug-Id: CID 1198259	2014-11-14 20:25:21 +01:00
Thilo Borgmann	e4cb6abb2f	bgmc: fix sizeof arguments CC: libav-devel@libav.org Bug-Id: CID 608084 / CID 700724	2014-11-14 20:25:02 +01:00
Benoit Fouet	00df32f6a9	avcodec/pngdec: split frame decoding in its own function. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-14 17:20:43 +01:00
Benoit Fouet	8cab24df07	avcodec/pngdec: create a function to handle small (<=4) bits per pixel values. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-14 17:13:08 +01:00
Benoit Fouet	24ca2ffad8	avcodec/pngdec: use else if instead of if for small bpp handling. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-14 17:12:39 +01:00
Benoit Fouet	c25b6ae8a2	avcodec/pngdec: fix some indentation/whitespaces Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-14 16:59:03 +01:00
Benoit Fouet	6499e63f7b	avcodec/pngdec: create a function to decode tRNS chunk. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-14 16:58:37 +01:00
Benoit Fouet	4f313a50ee	avcodec/pngdec: create a function to decode PLTE chunk. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-14 16:17:00 +01:00
Benoit Fouet	b35fa04152	avcodec/pngdec: create a function to decode IDAT chunk. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-14 16:16:47 +01:00
Benoit Fouet	3f1eaf590c	avcodec/pngdec: create a function to decode pHYs chunk. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-14 15:58:35 +01:00
Benoit Fouet	1523d1484d	avcodec/pngdec: create a function to decode IHDR chunk. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-14 15:58:02 +01:00
Benoit Fouet	98abb98cb1	avcodec/pngdec: rename decode_frame to decode_frame_png Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-14 15:35:12 +01:00
Carl Eugen Hoyos	3428865163	lavc/flashsv2enc: Fix encoding resolution error message.	2014-11-13 22:13:33 +01:00
Michael Niedermayer	5c805d69a4	avcodec/nellymoserenc: fix sign error Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 20:48:52 +01:00
Michael Niedermayer	4001fc4267	avcodec/4xm: remove duplicate assert Found-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 19:01:08 +01:00
James Almer	3cec54b7d7	x86/flacdsp: add SSE2 and AVX decorrelate functions Two to four times faster depending on instruction set, block size and channel count.	2014-11-13 13:47:55 -03:00
Michael Niedermayer	7a79c055e3	Merge commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a' * commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a': jpeg2000: do not compute the same value twice Conflicts: libavcodec/jpeg2000.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 15:20:40 +01:00
Michael Niedermayer	057b74d19c	Merge commit '994ab1804b8bf532f44876927b07b51f1f63247f' * commit '994ab1804b8bf532f44876927b07b51f1f63247f': ansi: check ff_set_dimensions return value Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 14:51:37 +01:00
Michael Niedermayer	04f6a5230d	Merge commit 'c7384664ba0cbb12d882effafbc6d321ae706cff' * commit 'c7384664ba0cbb12d882effafbc6d321ae706cff': avs: check ff_set_dimensions return value Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 14:51:03 +01:00
Michael Niedermayer	ecb748866e	Merge commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745' * commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745': shorten: check for return value Conflicts: libavcodec/shorten.c See: `e20ebe491c` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 14:21:58 +01:00
Michael Niedermayer	785f71fcd5	Merge commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a' * commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a': dcadec: initialize variables before use Conflicts: libavcodec/dcadec.c See: `53918a1c54` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 14:21:18 +01:00
Michael Niedermayer	2c4d5d3497	Merge commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319' * commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319': escape124: explicitly set get_bits1 variable Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 14:01:41 +01:00
Michael Niedermayer	9b424accbe	Merge commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834' * commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834': mlpdec: check for negative index Conflicts: libavcodec/mlpdec.c See: `8491ac3ad2` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 13:59:53 +01:00
Michael Niedermayer	e266e186cf	Merge commit '6abe7edabb7d57e82d7ea6312d30cf05d2192c5b' * commit '6abe7edabb7d57e82d7ea6312d30cf05d2192c5b': ffv1: fix out-of-bounds read The change should be harmless but theres no out of array access before the change Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 13:46:54 +01:00
Michael Niedermayer	198e55bfa7	Merge commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2' * commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2': vorbisenc: add missing parenthesis Conflicts: libavcodec/vorbisenc.c See: `f72b735d41` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 13:34:39 +01:00
Michael Niedermayer	ccfae03815	Merge commit '4dda5e9b0829b119c17d950906c61d3ebffc494f' * commit '4dda5e9b0829b119c17d950906c61d3ebffc494f': sunrastenc: mention missing break Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 13:31:08 +01:00
Michael Niedermayer	ef4e54e0df	Merge commit '28d82b7675bea76a1349070a3cdd737d964d4775' * commit '28d82b7675bea76a1349070a3cdd737d964d4775': vc1dec: refactor check with missing parenthesis Conflicts: libavcodec/vc1_mc.c tests/ref/fate/vc1_ilaced_twomv Theres no change to the reference checksums as this bug was not in FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 13:23:42 +01:00
Michael Niedermayer	7f8ef7876e	Merge commit 'e3f50f247155216229e34f165bae8c329d5a001e' * commit 'e3f50f247155216229e34f165bae8c329d5a001e': dnxhdenc: check negative index Conflicts: libavcodec/dnxhdenc.c Not merged, the cid index thats taken out of our table will be found again in said table. Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 12:56:32 +01:00
Michael Niedermayer	76fa78911f	Merge commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67' * commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67': display: fix order of operands Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 12:53:31 +01:00
Michael Niedermayer	7b824e8b25	Merge commit '8dd0a2c5cf40a8a49faae985adc11750b6429132' * commit '8dd0a2c5cf40a8a49faae985adc11750b6429132': libopusenc: prevent an out-of-bounds read by returning early Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 12:12:27 +01:00
Michael Niedermayer	3c6e148e84	Merge commit 'b09cf8afc5199d359ac985ad7cea72a6a9f20e4e' * commit 'b09cf8afc5199d359ac985ad7cea72a6a9f20e4e': libopusenc: check return value Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 12:02:05 +01:00
Michael Niedermayer	64e12aec96	Merge commit '68a35473ed423a14731c418939fba7913647979a' * commit '68a35473ed423a14731c418939fba7913647979a': 4xm: more thorought check for negative index and negative shift Conflicts: libavcodec/4xm.c Mostly not merged, the added checks, check for impossible conditions for paranoias sake they are replaced by asserts but thats probably overkill the vlc table does not contain out of range values or holes, nor does it permit the log2 values to become negative. Whenever a log2 value reaches 0 the selected table no longer contains an entry to trigger the case that would decrease it further Adding such impossible checks would confuse the reader Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 11:37:59 +01:00
Michael Niedermayer	3e1ac10345	avcodec/utils: Add ATRAC3+ to av_get_audio_frame_duration() Fixes Ticket3979 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-13 02:48:40 +01:00
Vittorio Giovara	a2448cfe16	jpeg2000: do not compute the same value twice CC: libav-stable@libav.org Bug-Id: CID 1026771 / CID 1026772 / CID 1026773	2014-11-13 01:41:27 +01:00
Vittorio Giovara	994ab1804b	ansi: check ff_set_dimensions return value CC: libav-stable@libav.org Bug-Id: CID 1135737	2014-11-13 01:41:27 +01:00
Vittorio Giovara	c7384664ba	avs: check ff_set_dimensions return value CC: libav-stable@libav.org Bug-Id: CID 1135738	2014-11-13 01:41:27 +01:00
Vittorio Giovara	59846452af	svq1enc: check ff_get_buffer return value CC: libav-stable@libav.org Bug-Id: CID 747723	2014-11-13 01:41:27 +01:00
Vittorio Giovara	8e104619a6	shorten: check for return value Avoid a possible negative bitshift. CC: libav-stable@libav.org Bug-Id: CID 1194400	2014-11-13 01:41:26 +01:00
Vittorio Giovara	d5d2d6c3b8	dcadec: initialize variables before use CC: libav-stable@libav.org Bug-Id: CID 700751 / CID 700752	2014-11-13 01:41:26 +01:00
Vittorio Giovara	1a9c1333b5	escape124: explicitly set get_bits1 variable Makes coverity less confused. CC: libav-stable@libav.org Bug-Id: CID 1203487	2014-11-13 01:41:26 +01:00
Vittorio Giovara	2ffb0598db	mlpdec: check for negative index CC: libav-stable@libav.org Bug-Id: CID 970924	2014-11-13 01:41:26 +01:00
Vittorio Giovara	6abe7edabb	ffv1: fix out-of-bounds read CC: libav-stable@libav.org Bug-Id: CID 1047234	2014-11-13 01:41:26 +01:00
Vittorio Giovara	5aa710f461	vorbisenc: add missing parenthesis Bug-Id: CID 1238791	2014-11-13 01:41:26 +01:00
Vittorio Giovara	4dda5e9b08	sunrastenc: mention missing break Bug-Id: CID 732231	2014-11-13 01:41:26 +01:00
Vittorio Giovara	2b5c1efa14	g2meet: check ff_set_dimensions return value CC: libav-stable@libav.org Bug-Id: CID 1135739	2014-11-13 01:41:26 +01:00
Vittorio Giovara	e9a6ae775d	dpxenc: mention missing break Bug-Id: CID 732229	2014-11-13 01:41:26 +01:00
Vittorio Giovara	c6d7c201df	indeo3: check ff_set_dimensions return value CC: libav-stable@libav.org Bug-Id: CID 1135740	2014-11-13 01:41:26 +01:00
Vittorio Giovara	28d82b7675	vc1dec: refactor check with missing parenthesis FATE tests updated accordingly, no visual difference. CC: libav-stable@libav.org Bug-Id: CID 1087087	2014-11-13 01:41:25 +01:00
Vittorio Giovara	e3f50f2471	dnxhdenc: check negative index CC: libav-stable@libav.org Bug-Id: CID 700464	2014-11-13 01:41:25 +01:00
Vittorio Giovara	b1b1a7370e	display: fix order of operands CC: libav-stable@libav.org Bug-Id: CID 1238828 / CID 1238832	2014-11-13 01:41:25 +01:00
Vittorio Giovara	8dd0a2c5cf	libopusenc: prevent an out-of-bounds read by returning early CC: libav-stable@libav.org Bug-Id: CID 1244188	2014-11-13 01:41:25 +01:00
Vittorio Giovara	b09cf8afc5	libopusenc: check return value CC: libav-stable@libav.org Bug-Id: CID 739870	2014-11-13 01:41:25 +01:00
Vittorio Giovara	2c98dc75f2	vc1dec: always initialize tx and ty CC: libav-stable@libav.org Bug-Id: CID 1245702 / CID 1245703	2014-11-13 01:41:25 +01:00
Vittorio Giovara	bdcb5794f0	nellymoserenc: fix array index CC: libav-stable@libav.org Bug-Id: CID 732258	2014-11-13 01:41:25 +01:00
Michael Niedermayer	29234f5681	vp7: fix checking vp7_feature_value_size() CC: libav-stable@libav.org Bug-Id: CID 1197061	2014-11-13 01:41:25 +01:00
Michael Niedermayer	aa7c429c4e	nellymoserenc: fix array element ordering Fixes assertion failures and valgrind warnings in trellis encoder. CC: libav-stable@libav.org Bug-Id: CID 732256 / CID 732257	2014-11-13 01:41:25 +01:00
Vittorio Giovara	68a35473ed	4xm: more thorought check for negative index and negative shift CC: libav-stable@libav.org Bug-Id: CID 1087094	2014-11-13 01:18:09 +01:00
Michael Niedermayer	d03867c248	avcodec/dvbsubdec: av_assert* instead of assert() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-12 20:08:24 +01:00
James Almer	84ccc317ce	x86/flacdsp: separate decoder and encoder dsp initialization Signed-off-by: James Almer <jamrial@gmail.com>	2014-11-12 14:41:45 -03:00
Michael Niedermayer	39dfe6801a	avcodec/dvbsubdec: Cleanup on *malloc failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-12 17:54:52 +01:00
Michael Niedermayer	9d6ad68fa4	avcodec/h264_parser: Avoid adding SEI to the global header Only consider SEI when no PPS has been found yet Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-12 03:28:15 +01:00
Michael Niedermayer	dadc1f5ee9	Merge commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb' * commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb': tiff: Use av_mallocz_array Conflicts: libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-12 00:08:06 +01:00
Michael Niedermayer	940f5c08e5	Merge commit '1b667269062eb6aec0b8726393ea91b7f7f57fde' * commit '1b667269062eb6aec0b8726393ea91b7f7f57fde': h264_parser: don't stop on SPS_EXT in split Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-11 23:21:12 +01:00
Michael Niedermayer	287eb69973	Merge commit '443502aed8b814d883825e52e91e4f018955aa66' * commit '443502aed8b814d883825e52e91e4f018955aa66': dvbsubdec: move shared codepath Conflicts: libavcodec/dvbsubdec.c The merged code is ignored and the factorization redone with the code that is in FFmpeg. Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-11 23:08:55 +01:00
Michael Niedermayer	e0c36f5825	avcodec/dvbsubdec: Fix 8bit non_mod case Untested, i failed to find a sample which triggers this case Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-11 22:57:01 +01:00
Michael Niedermayer	2813dabdd4	avcodec/dvbsubdec: use av_freep() for saftey Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-11 22:20:20 +01:00
Michael Niedermayer	4809ac75fc	Merge commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8' * commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8': dvbsubdec: improve error checking Conflicts: libavcodec/dvbsubdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-11 22:19:54 +01:00
Michael Niedermayer	6229f7823e	avcodec/dvbsubdec: Add return code to save_subtitle_set() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-11 22:15:14 +01:00
Michael Niedermayer	4dd85093f1	Merge commit '9e9be5a20c0b36dce1cae11f5f5957886231a764' * commit '9e9be5a20c0b36dce1cae11f5f5957886231a764': hevc_mvs: prevent unitialized use Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-11 21:57:41 +01:00
Michael Niedermayer	9311026ec7	Merge commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d' * commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d': mpegvideo: check mpv return value Conflicts: libavcodec/mpegvideo.c See: `f4d73f0fb5` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-11 21:22:09 +01:00
Michael Niedermayer	aeb1621d1f	Merge commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba' * commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba': mpeg12enc: increase declared size of block function argument See: `2cf514354b` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-11 21:16:00 +01:00
Michael Niedermayer	81e3f819bd	Merge commit '52f954da7594c31ad94c9bcb54290145b59b27f5' * commit '52f954da7594c31ad94c9bcb54290145b59b27f5': libavcodec: Unconditionally build xiph.o Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-11 20:58:33 +01:00
Luca Barbato	c9c7d59b7d	tiff: Use av_mallocz_array CC: libav-stable@libav.org	2014-11-11 12:01:00 +01:00
John Stebbins	1b66726906	h264_parser: don't stop on SPS_EXT in split Add SPS_EXT, SEI, and subset SPS to codes that are skipped during split. These codes can come before the PPS and results in incomplete extradata.	2014-11-11 11:49:55 +01:00
Vittorio Giovara	443502aed8	dvbsubdec: move shared codepath CC: libav-stable@libav.org Bug-Id: CID 1238839	2014-11-11 11:49:54 +01:00
Vittorio Giovara	2383323661	dvbsubdec: improve error checking Use av_mallocz_array instead of iterating and check the returned memory. Check returned memory and cleanly exit in case of error during the loop. Avoid a null pointer dereference for invalid data. CC: libav-stable@libav.org Bug-Id: CID 29575	2014-11-11 11:49:54 +01:00
Michael Niedermayer	4cb9f1a774	h264_cabac: fix one fill_rectangle() indentation level Bug-Id: CID 1087088	2014-11-11 11:49:54 +01:00
Jernej Fijačko	1bdd21d975	dvbsubdec: add missing break Fix a memory leak too. CC: libav-stable@libav.org Bug-Id: CID 732230	2014-11-11 11:49:54 +01:00
Vittorio Giovara	60b0551334	png_parser: fix size of chunk_lenght Fixes the comparison against constant value 0x7fffffff. CC: libav-stable@libav.org Bug-Id: CID 1198260	2014-11-11 11:49:54 +01:00
Michael Niedermayer	a6defd1f5b	hevc_cabac: decrease CABAC_MAX_BIN Prevents shifts with undefined behavior, as no syntax element has a valid value greater than 1 << 31. Bug-Id: CID 1206635	2014-11-11 11:49:54 +01:00
Vittorio Giovara	9e9be5a20c	hevc_mvs: prevent unitialized use CC: libav-stable@libav.org Bug-Id: CID 1244202	2014-11-11 11:49:47 +01:00
Changjiang Wei	6f2068e626	avcodec/hevc.c: for big negative mvy value, should wait line 0 of ref frame due to edge extending Reviewed-by: Mickaël Raulet <mraulet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-11 11:45:20 +01:00
Vittorio Giovara	0e1ebfebc8	4xm: drop unnecessary check data_size is always >= 0 in this case. CC: libav-stable@libav.org Bug-Id: CID 1238788	2014-11-11 11:41:49 +01:00
Michael Niedermayer	7c61e4b1a0	hpeldsp: Increase put_no_rnd_pixels_tab[][] size CC: libav-stable@libav.org Bug-Id: CID 991852	2014-11-11 11:41:49 +01:00
Vittorio Giovara	db71c4926d	mjpegenc: fix argument size in encode_mb CC: libav-stable@libav.org Bug-Id: CID 1047235	2014-11-11 11:41:49 +01:00
Rong Yan	cfaa233962	libavcodec/ppc/me_cmp.c : support little endian in sse8_altivec(), hadamard8_diff8x8_altivec() and hadamard8_diff16x8_altivec() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-11 11:37:13 +01:00
Rong Yan	bb38cb14cc	libavcodec/ppc/me_cmp.c : factorize little and big endian code add marcos GET_PERM() LOAD_PIX() for POWER LE Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-11 11:34:38 +01:00
Vittorio Giovara	898e9a24ef	mpegvideo: check mpv return value CC: libav-stable@libav.org Bug-Id: CID 1238786	2014-11-11 11:26:02 +01:00
Michael Niedermayer	fe27aeaeab	mpeg12enc: increase declared size of block function argument CC: libav-stable@libav.org Bug-Id: CID 1047236 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>	2014-11-11 11:26:02 +01:00
Vittorio Giovara	f349f4b550	mpegvideo: fix size of array CC: libav-stable@libav.org Bug-Id: CID 1238789	2014-11-11 11:26:02 +01:00
Martin Storsjö	52f954da75	libavcodec: Unconditionally build xiph.o vorbis_parser.o is built unconditionally since `5e80fb7ff`, and the unconditionally built parts of it depend on xiph.o. This fixes builds with --disable-everything. Signed-off-by: Martin Storsjö <martin@martin.st>	2014-11-11 12:01:16 +02:00
Michael Niedermayer	48efe9ec86	avcodec/utvideodec: Fix undefined behavior in shift Fixes: asan_heap-oob_2573085_3783_utvideo_rgba_median.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-11 03:35:57 +01:00
Michael Niedermayer	35dcc8a040	avcodec/lagarith: fix integer overflow Fixes: asan_heap-oob_1bf48fa_2513_lag-yuy2.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-11 03:19:49 +01:00
Michael Niedermayer	5dcb99033d	avcodec/wmaprodec: Fix integer overflow in sfb_offsets initialization Fixes out of array read Fixes: asan_heap-oob_2aec5b0_1828_classical_22_16_2_16000_v3c_0_exclusive_0_29.wma Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-10 23:09:39 +01:00
Jon Morley	8c28a39c2c	options_table.h: min value for colorspace is 0 (AVCOL_SPC_RGB) The min value for colorspace should be zero and not one since the first valid index into the frame colorspace array is AVCOL_SPC_RGB which is 0. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-10 21:18:57 +01:00
Michael Niedermayer	7656c4c6e6	avcodec/utvideodec: fix assumtation that slice_height >= 1 Fixes out of array read Fixes: asan_heap-oob_2573085_3783_utvideo_rgba_median.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-10 19:45:36 +01:00
Michael Niedermayer	e981de81fe	avcodec/lagarith: fix chroma plane width & height Fixes out of array read Fixes: asan_heap-oob_1bf48fa_2513_lag-yuy2.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-10 17:54:50 +01:00
Martin Storsjö	28396d17ff	libfdk-aacdec: Support building with the latest version of fdk-aac The latest fdk-aac code drop (from android 5.0) changed the channel layout enums (changing the value of existing enum constants), and renamed the option for downmixing. The failsafe comparison between ctype and FF_ARRAY_ELEMS(channel_counts) can trigger warnings (-Wtautological-constant-out-of-range-compare) when building with the old FDK AAC releases, where it can't be out of range with the enum values used there. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>	2014-11-10 09:43:57 +02:00
Michael Niedermayer	f6a8c77afb	avcodec/utils: Fix warning: comparison between enum foo and enum bar [-Wenum-compare] Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-10 02:54:24 +01:00
Michael Niedermayer	9889b29ff4	avcodec/utils: make sidedata remapping table static const Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-10 02:53:21 +01:00
Martin Storsjö	b44a242c3d	libfdk-aacdec: Support building with the latest version of fdk-aac The latest fdk-aac code drop (from android 5.0) changed the channel layout enums (changing the value of existing enum constants), and renamed the option for downmixing. The failsafe comparison between ctype and FF_ARRAY_ELEMS(channel_counts) can trigger warnings (-Wtautological-constant-out-of-range-compare) when building with the old FDK AAC releases, where it can't be out of range with the enum values used there. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-10 02:46:46 +01:00
Michael Niedermayer	0960cc4cc6	Merge commit 'e3e317e0c015b164b6c2eb8913e393216d78de23' * commit 'e3e317e0c015b164b6c2eb8913e393216d78de23': lavc: Compact the side-data passthrough Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-10 00:57:41 +01:00
Lukasz Marek	db2caf0a80	lavc/options: fix shallow copy context avcodec_copy_context leaves shallow copy of string/binary/dict options. Double free/accessing freed memory may occur. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>	2014-11-09 17:56:08 +01:00
Luca Barbato	e3e317e0c0	lavc: Compact the side-data passthrough	2014-11-09 12:29:59 +01:00
Michael Niedermayer	55d592f7d9	avcodec/aacdec: Skip processing channel elements which have not been present Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-09 11:41:13 +01:00
Michael Niedermayer	f9fa560597	avcodec/aacenc: check input for NaN Fixes Ticket3762 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-08 23:32:39 +01:00
Carl Eugen Hoyos	e2e36a739d	Fix make checkheaders for libavcodec/vorbis_parser.h.	2014-11-08 00:59:37 +01:00
Michael Niedermayer	960c573cc5	avcodec/mjpegdec: support pix fmt id 0x22111111 Fixes: 4163724_300.jpg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-07 15:37:11 +01:00
Rong Yan	79e0255956	libavcodec/ppc/hpeldsp_altivec.c : fix ff_put_pixels16_altivec() put_no_rnd_pixels16_xy2_altivec() put_no_rnd_pixels8_xy2_altivec() avg_pixels8_altivec() avg_pixels8_xy2_altivec() put_pixels16_xy2_altivec() put_pixels8_xy2_altivec() ff_avg_pixels16_altivec() for POWER LE Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-07 12:32:03 +01:00
Michael Niedermayer	b1c99f4c5f	avcodec/aacdec: Add table of profile names based on tables of aac encoders from libavcodec Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-07 03:09:50 +01:00
Michael Niedermayer	2daae445c0	avcodec/aacdec: print extension type when startcode debugging is on Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-07 03:09:50 +01:00
Michael Niedermayer	c53a1507aa	Merge commit '199d9f995da53fe2507821f6d96bbc692574e1a9' * commit '199d9f995da53fe2507821f6d96bbc692574e1a9': mjpegdec: fix undefined shift Conflicts: libavcodec/mjpegdec.c See: `b432960528` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-06 18:28:49 +01:00
Michael Niedermayer	ad0cf8e063	Merge commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1' * commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1': pthreads_frame: Do not leak on failure path See: `11679e1b90` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-06 18:17:33 +01:00
Michael Niedermayer	98d6f0ffef	Merge commit '37b3361e755361d4ff14a2973df001c0140d98d6' * commit '37b3361e755361d4ff14a2973df001c0140d98d6': mpeg12enc: factor out check in encode_dc Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-06 17:28:40 +01:00
Michael Niedermayer	c96a44d0dd	Merge commit '0a6664706168dc1049967bec311970d720581625' * commit '0a6664706168dc1049967bec311970d720581625': mpegvideo_enc: factor out denominator and explicitly cast operands Conflicts: libavcodec/mpegvideo_enc.c See: `c753b56b4d` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-06 17:21:36 +01:00
Michael Niedermayer	5241f90058	Merge commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118' * commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118': mpegvideo_enc: rework direct mode check Conflicts: libavcodec/mpegvideo_enc.c See: `ad98567198` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-06 17:14:38 +01:00
Vittorio Giovara	199d9f995d	mjpegdec: fix undefined shift Add a comment to explain the code. CC: libav-stable@libav.org Bug-Id: CID 1194388	2014-11-06 10:44:46 -05:00
Luca Barbato	ac4a5e3abd	pthreads_frame: Do not leak on failure path CC: libav-stable@libav.org Bug-Id: CID 1135767 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>	2014-11-06 10:44:46 -05:00
Vittorio Giovara	37b3361e75	mpeg12enc: factor out check in encode_dc Makes coverity less confused and the code more readable. CC: libav-stable@libav.org Bug-Id: CID 751744	2014-11-06 10:44:46 -05:00
Vittorio Giovara	0a66647061	mpegvideo_enc: factor out denominator and explicitly cast operands CC: libav-stable@libav.org Bug-Id: CID 608053	2014-11-06 10:44:46 -05:00
Vittorio Giovara	e0a1d0a2b0	mpegvideo_enc: rework direct mode check Remove stray semicolon and share codepaths. CC: libav-stable@libav.org Bug-Id: CID 991857	2014-11-06 10:44:46 -05:00
Vittorio Giovara	5d29efe4b0	mpeg12dec: simplify context duplication CC: libav-stable@libav.org Bug-Id: CID 717453 / CID 717454 / CID 717915	2014-11-06 10:44:46 -05:00
Michael Niedermayer	e591608753	avcodec/xiph: make extradata argument const Fixes "warning: passing argument 1 of avpriv_split_xiph_headers discards const qualifier from pointer target type" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-06 14:41:38 +01:00
Michael Niedermayer	cffd2713e9	Merge commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48' * commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48': lavc: make avpriv_flac_is_extradata_valid() private on the next bump Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-06 14:17:46 +01:00
Michael Niedermayer	cfef947f7f	Merge commit 'c070a8751597e3aa1b443e88464da785d8966b14' * commit 'c070a8751597e3aa1b443e88464da785d8966b14': lavc: make avpriv_flac_parse_streaminfo() private on the next bump Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-06 13:54:11 +01:00
Michael Niedermayer	b6a9956396	Merge commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c' * commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c': lavf: stop using avpriv_flac_parse_streaminfo() Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-06 13:42:41 +01:00
Michael Niedermayer	f74be3669d	Merge commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959' * commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959': lavc,lavf: switch to the new vorbis parse API Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-06 12:05:17 +01:00
Michael Niedermayer	7ffdc7bef2	avcodec/export av_vorbis_parse_frame_flags() The other functions where changed in the previous merge Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-06 11:58:32 +01:00
Michael Niedermayer	44fa2671e0	Merge commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70' * commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70': lavc: add a public API for parsing vorbis packets. Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/version.h libavcodec/vorbis_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-06 11:21:47 +01:00
Michael Niedermayer	5f7887ca8d	Merge commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67' * commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67': vorbis_parser: add an AV prefix to VorbisParseContext Conflicts: libavcodec/vorbis_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-06 11:06:19 +01:00
Michael Niedermayer	a0617025dd	Merge commit '8747926' * commit '8747926': vorbis_parser: use a dedicated AVClass for logging Conflicts: libavcodec/vorbis_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-06 10:50:59 +01:00
Anton Khirnov	acc897e6b1	lavc: make avpriv_flac_is_extradata_valid() private on the next bump	2014-11-06 09:04:56 +01:00
Anton Khirnov	c070a87515	lavc: make avpriv_flac_parse_streaminfo() private on the next bump	2014-11-06 09:04:12 +01:00
Anton Khirnov	7784f47762	lavf: stop using avpriv_flac_parse_streaminfo() The only parameters needed by the demuxers are the sample rate and sample count, which can be trivially extracted manually, without resorting to an avpriv function.	2014-11-06 09:02:25 +01:00
Anton Khirnov	2f3fadfbe3	lavc,lavf: switch to the new vorbis parse API	2014-11-06 09:00:46 +01:00
Anton Khirnov	5e80fb7ff2	lavc: add a public API for parsing vorbis packets. It is required by (at least) the ogg demuxer. Mark the current semi-public apriv API for removal.	2014-11-06 08:51:25 +01:00
Anton Khirnov	6896f95b24	vorbis_parser: add an AV prefix to VorbisParseContext This is done in preparation for making it public.	2014-11-06 08:47:54 +01:00
Anton Khirnov	874792641e	vorbis_parser: use a dedicated AVClass for logging Currently, the API takes an external AVCodecContext, which is used only for extradata and logging. This change will allow to it to work without an AVCodecContext in the following commits.	2014-11-06 08:47:21 +01:00
Michael Niedermayer	817663897e	avcodec/mpegaudio_parser: fix off by 1 error in bitrate calculation Fixes Ticket3918 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-06 00:05:22 +01:00
Reimar Döffinger	a26d0ffa18	vdpau_mpeg4: Do not fail on unknown profile. This is a regression, previous code did not require users to set the profile to use VDPAU. In addition, ASP is a superset of SP, so there is not even a good reason to require it. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-11-05 20:07:31 +01:00
Michael Niedermayer	43fee7ad92	Merge commit '4ff670d99bebd97429322719089363d83143477d' * commit '4ff670d99bebd97429322719089363d83143477d': hwaccel: Deinitialize hardware acceleration early enough Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-05 02:10:46 +01:00
Michael Niedermayer	77f1199e8f	avcodec/mpeg12dec: do not trust AVCodecContext input dimensions Fixes initial wtv dimensions Fixes Ticket4070 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-05 02:00:22 +01:00
Michael Niedermayer	ae4bb6c488	Merge commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2' * commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2': aacdec: add default case in channel layout Conflicts: libavcodec/aacdec.c Note, the default case is currently unreachable See: `a48b890392` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-04 22:35:41 +01:00
Rémi Denis-Courmont	4ff670d99b	hwaccel: Deinitialize hardware acceleration early enough The application will destroy the underlying hardware handles when get_format() gets called again. Also this ensures the deinitialization takes place if the get_format callback returns an error. Regression from `1c80c9d7ef`. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-11-04 22:15:17 +01:00
Michael Niedermayer	df82125acb	Merge commit '930ffd46e1e742674aa7cc1c2450020c63b5015b' * commit '930ffd46e1e742674aa7cc1c2450020c63b5015b': aacsbr: change order of operation to prevent out of array read Conflicts: libavcodec/aacsbr.c See: `c2340831b8` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-04 22:04:04 +01:00
Michael Niedermayer	ce63cb4ff2	Merge commit '9f6f407463ff8b7681befd04b6655bb7c6d9b3e1' * commit '9f6f407463ff8b7681befd04b6655bb7c6d9b3e1': aacsbr: treat 1-d arrays as such Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-04 21:53:21 +01:00
Michael Niedermayer	e1bcbca998	Merge commit 'c442190a6bfd8036f6c32b78e1e96ff3b830f8f0' * commit 'c442190a6bfd8036f6c32b78e1e96ff3b830f8f0': error_resilience: initialize prev_* variables Note, these variables are not used without initialization prior to the change Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-04 21:28:48 +01:00
Michael Niedermayer	567ea2d64c	Merge commit '240b22afe14ef477da1b439b9ed7bca6cc7d6c26' * commit '240b22afe14ef477da1b439b9ed7bca6cc7d6c26': motion_est: remove dead code Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-04 21:10:02 +01:00
Vittorio Giovara	77ab341c0c	aacdec: add default case in channel layout Bug-Id: CID 732291	2014-11-04 09:28:45 -05:00
Michael Niedermayer	930ffd46e1	aacsbr: change order of operation to prevent out of array read CC: libav-stable@libav.org Bug-Id: CID 732250	2014-11-04 09:28:45 -05:00
Michael Niedermayer	716674b151	avcodec/libwebpenc: add quality option previously quality could only be set through qscale/global_quality but the scale was inverted. Using a separate option avoids the confusion from qscale working backward. Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Reviewed-by: Clément Bœsch <u@pkh.me> Reviewed-by: Nicolas George <george@nsup.org> Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-03 19:10:22 +01:00
Vittorio Giovara	9f6f407463	aacsbr: treat 1-d arrays as such CC: libav-stable@libav.org Bug-Id: CID 1238802 / CID 1238793 / CID 1238785 CID 1238808 / CID 1238809	2014-11-03 12:46:18 -05:00
Vittorio Giovara	f52b871761	celp_filters: don't use filter lenght as loop bound CC: libav-stable@libav.org Bug-Id: CID 717906 / CID 717907 / CID 717916 / CID 717917 / CID 717919 / CID 732259	2014-11-03 12:45:42 -05:00
Vittorio Giovara	c442190a6b	error_resilience: initialize prev_* variables CC: libav-stable@libav.org Bug-Id: CID 732293 / CID 732294	2014-11-03 12:45:09 -05:00
Vittorio Giovara	240b22afe1	motion_est: remove dead code mb_type is initialized to 0 and never updated before the check. Bug-Id: CID 1238782	2014-11-03 10:15:53 -05:00
Vittorio Giovara	351d0f8b7a	get_bits: remove unused assignment Bug-Id: CID 1238816	2014-11-03 10:15:07 -05:00
Michael Niedermayer	206c98f303	avcodec/options_table fix min of audio channels and sample rate Found-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-03 13:21:07 +01: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	bab09864b4	avcodec/jacosubdec: use time_internal.h, simplify code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-02 20:06:40 +01:00
Michael Niedermayer	547fce9585	avcodec/h264_slice: Clear table pointers to avoid stale pointers Might fix Ticket3889 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-02 01:56:38 +01:00
Michael Niedermayer	5aaf5df06d	avcodec/libwebpenc: support "P" frames in webp animations Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-01 20:10:52 +01:00
Reimar Döffinger	46353759cb	mpeg4vdpau: Fix priv data size. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	2014-11-01 15:43:52 +01:00
Michael Niedermayer	e5054c8eed	avcodec/pthread_slice: Use av_freep() to avoid leaving stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-01 11:36:41 +01:00
Michael Niedermayer	842745fe17	avcodec/pthread_frame: Simplify code by using av_reallocp_array() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-01 11:36:41 +01:00
Michael Niedermayer	cc769931ab	avcodec/parser: use av_freep() to avoid leaving stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-11-01 11:36:41 +01:00
Michael Niedermayer	0c6c5d7bcb	avcodec/mjpegenc: use av_freep(), avoid leaving stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-31 13:36:19 +01:00
Michael Niedermayer	fc8d59fa6f	avcodec/h264_parser: Use av_freep() to avoid leaving stale pointers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-30 23:58:52 +01:00
Michael Niedermayer	2a26b22a17	avcodec/cngdec: Use av_freep() to avoid leaving stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-30 23:36:51 +01:00
Michael Niedermayer	a1cb8779e2	avcodec/crystalhd: use av_freep() to avoid stale pointers this leaves some av_free() where the pointer is overwritten shortly later Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-30 23:35:32 +01:00
Michael Niedermayer	adfc3b81b1	avcodec/dvbsubdec: use av_freep() to avoid leaving stale pointers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-30 23:29:33 +01:00
Michael Niedermayer	25a360286d	avcodec/dvbsubdec: merge declaration and init Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-30 23:28:15 +01:00
Michael Niedermayer	47f1596ece	avcodec/dxtory: use unaligned copy for unaligned addresses Fixes undefined behavior Fixes: asan_heap-oob_112c6b3_13_012.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-30 19:43:03 +01:00
Michael Niedermayer	e91ba2efa9	avcodec/svq1dec: zero terminate embedded message before printing Fixes out of array access Fixes: asan_stack-oob_49b1e5_10_009.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-30 18:23:09 +01:00
Michael Niedermayer	10e32618ac	avcodec/cook: check that the subpacket sizes fit in block_align Fixes out of array read Fixes: asan_heap-oob_fb5c50_19_018.rmvb Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-30 16:54:17 +01:00
Michael Niedermayer	32e666c354	avcodec/g2meet: check tile dimensions to avoid integer overflow Fixes out of array access Fixes: asan_heap-oob_12a55d3_30_029.wmv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-30 01:22:32 +01:00
Carl Eugen Hoyos	f05855414e	lavc/utils: Make pix_fmt desc pointer const. Fixes an "initialization discards qualifiers from pointer target type" warning.	2014-10-30 00:27:04 +01:00
Michael Niedermayer	df74811cd5	avcodec/utils: Align dimensions by at least their chroma sub-sampling factors. Fixes: out of array accesses Fixes: asan_heap-oob_112c6b3_13_012.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-29 14:16:54 +01:00
Michael Niedermayer	0c42f47e38	avcodec/libutvideodec: Try to fix build failure with old libutvideo Found-by: Jan Ehrhardt <phpdev@ehrhardt.nl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-29 13:15:26 +01:00
Michael Niedermayer	5b86447080	Merge remote-tracking branch 'cehoyos/master' * cehoyos/master: Mention in the documentation that fieldmatch needs cfr input. Use v4l2 input format automatically if filename starts with "/dev/video" Print a warning if a subtitle demuxer changes utf16 to utf8. Do not set the lame quality if the user didn't request it. Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-29 02:54:46 +01:00
Carl Eugen Hoyos	2612214555	Do not set the lame quality if the user didn't request it. This makes FFmpeg's mp3 output more similar to lame's output.	2014-10-29 01:31:06 +01:00
Michael Niedermayer	f3c0e0bf6f	avcodec/dnxhddec: treat pix_fmt like width/height Fixes out of array accesses Fixes: asan_heap-oob_22c9a39_16_015.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-29 00:57:52 +01:00
Michael Niedermayer	e70312dfc2	avcodec/dxa: check dimensions Fixes out of array access Fixes: asan_heap-oob_11222fb_21_020.dxa Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-28 15:30:05 +01:00
Christophe Gisquet	beb944786e	dvenc: mark encoder as intra And thus allow various multithreading. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-28 12:48:58 +01:00
Christophe Gisquet	4fa772acbb	dv: increase VLC reading bits to 10 This also requires a bump in the table size of bit patterns to 1664. From 356 to 348 cycles. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-28 12:22:03 +01:00
Michael Niedermayer	dd5123a04c	Merge commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745' * commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745': vdpau: return MAIN instead of BASELINE for H.264 CBP Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-28 11:05:12 +01:00
Michael Niedermayer	ab9ba88877	Merge commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893' * commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893': vdpau/h264: request MAIN rather than BASELINE VDPAU profile for CBP Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-28 10:58:12 +01:00
Rémi Denis-Courmont	ce91b2eae6	vdpau: return MAIN instead of BASELINE for H.264 CBP This is the same as the previous change, but for applications using the old API (such as VLC 2.2). Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-10-28 07:06:33 +01:00
Rémi Denis-Courmont	26ab504ad8	vdpau/h264: request MAIN rather than BASELINE VDPAU profile for CBP The H.264 Constrained Baseline Profile (CBP) is a subset of both the Main Profile and the Baseline Profile. In principles, a hardware decoder that supports either of those can decode CBP content. As it happens, Main is supported by all VDPAU drivers, and Baseline is not. So favor map CBP to MP for now. Hopefully in the future libvdpau will offer an explicit choice for CBP. This fixes bug 757. Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-10-28 07:06:13 +01:00
Michael Niedermayer	39680cacee	avcodec/dirac_arith: fix integer overflow Fixes: asan_heap-oob_1078676_9_008.drc Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-28 02:15:40 +01:00
Michael Niedermayer	5145d22b88	avcodec/diracdec: Tighter checks on CODEBLOCKS_X/Y Fixes very long but finite loop Fixes: asan_heap-oob_107866c_42_041.drc Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-28 01:25:57 +01:00
Michael Niedermayer	526886e606	avcodec/diracdec: Use 64bit in calculation of codeblock coordinates Fixes integer overflow Fixes out of array read Fixes: asan_heap-oob_107866c_42_041.drc Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-28 01:25:28 +01:00
Michael Niedermayer	a050cf0c45	avcodec/sgidec: fix count check Fixes: asan_heap-oob_22b30d4_39_038.sgi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-27 20:55:57 +01:00
Michael Niedermayer	3b20ed8548	avcodec/sgidec: fix linesize for 16bit Fixes: asan_heap-oob_22b30d4_39_038.sgi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-27 20:49:47 +01:00
Michael Niedermayer	852aaead1f	avcodec/hevc_ps: Check default display window bitstream and skip if invalid Fixes Ticket4035 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-27 14:03:09 +01:00
Michael Niedermayer	69a9a90d2e	avcodec/h264_parser: rewrite the parse_nal_units() loop logic based on h264.c Fixes Ticket4011 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-27 04:58:49 +01:00
Michael Niedermayer	3b678da5e3	avcodec/h264: simplify find_start_code() this also uses avpriv_find_start_code(), though no speed change is expected as the area searched is generally small Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-27 04:26:33 +01:00
Michael Niedermayer	4898440f6b	Move get_avc_nalsize() and find_start_code() to h264.h This allows sharing them with the h264 parser Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-27 04:22:42 +01:00
Kieran Kunhya	74141f693d	avcodec: Add support for Opus in MPEG-TS Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-26 22:29:07 +01:00
Christophe Gisquet	05da586fef	dv: move inverse weight tables to decoder The encoder has its own tables and does not access the idct_factor member of the DVVideoContext structure. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-26 19:21:59 +01:00
Christophe Gisquet	6fe02d25ee	dv: fix weight table for 2x4x8 transform The coefficients must be in the appropriate zigzag scan order. Also fix their values at the same time, as they were pretty wrong. Fixes ticket #2970. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-26 18:51:52 +01:00
Christophe Gisquet	1086f09da3	dv: more precise weight table for 8x8 It is derived from the actual equations of the specs. In particular, it is closer to the inverse of what the encoder uses. fate tests accordingly updated. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-25 19:01:45 +02:00
Christophe Gisquet	80b29c2d0c	dv: use smaller type for weight tables Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-25 16:54:12 +02:00
Christophe Gisquet	eacf2e8eb3	dv: better split weight tables assignment This is a mostly cosmetical patch in preparation for the following. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-25 16:44:43 +02:00
Michael Niedermayer	dd5c2fe177	avcodec: Read errno before av_log() as the callback from av_log() might affect errno Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-25 13:28:51 +02:00
Michael Niedermayer	59a4792830	avcodec/libutvideodec: Support YUV422P10 Based on ConvertToPlanar() from libutvideo libutvideo sadly does not seem to support exporting its internal planar buffers Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-25 00:15:15 +02:00
Eric Zimmerman	4ba5420e4d	Added support for G2M5 codec This has also been independently found and fixed similarly by carl in f4a3bbf4a3cd375121ea2495817f3e50e831ed48 The 2nd magic check is taken from carls implementation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-24 19:36:09 +02:00
Benoit Fouet	e56425d1a7	avcodec/aacdec: warn user when remapping streams. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-24 18:54:06 +02:00
Olivier Langlois	6fdf35fe35	lavc: Use av_gettime_relative Whenever av_gettime() is used to measure relative period of time, av_gettime_relative() is prefered as it guarantee monotonic time on supported platforms. Signed-off-by: Martin Storsjö <martin@martin.st>	2014-10-24 09:53:42 +03:00
Michael Niedermayer	00dbd7c4ae	avcodec/utils: Print the codec name that is missing on the whitelist Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-23 23:30:41 +02:00
Michael Niedermayer	a1d06a0121	avcodec/options_table: Fix codec_whitelist flags Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-23 23:02:48 +02:00
James Almer	7292b0477a	x86/hpeldsp: fix loop in {avg,avg_no_rnd}_pixels16_x2_mmx Handle it inside the __asm__() block. Fixes fate-vc1_ilaced_twomv when using the gcc-usan toolchain. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>	2014-10-23 13:11:05 -03:00
Eejya Singh	6dc99fdf0e	Added STL demuxer and decoder Signed-off-by: Clément Bœsch <u@pkh.me>	2014-10-22 23:12:38 +02:00
Christophe Gisquet	0e8bfd3c93	avcodec/tiffenc: properly compute packet size The bytes per row is a better indication of it. Helps resolving ticket #3874 by fixing ffmpeg's encoder and transforming the issue in a issue with non-compliant decoders. ffmpeg's one is ok, but unfortunately, many others aren't handling correctly unusual chroma samplings. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-22 22:28:02 +02:00
Michael Niedermayer	c5ffd7aee5	avcodec/mjpegdec: use FF_CEIL_RSHIFT() for width No testcase known Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-22 02:28:54 +02:00
Michael Niedermayer	d5a3a20d1e	avcodec/mjpegdec: simplify chroma_height calculation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-21 21:36:17 +02:00
Michael Niedermayer	059c842818	avcodec/mjpegdec: Support 24111100 pix fmt id Fixes 129533924_640.jpg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-21 16:41:47 +02:00
Michael Niedermayer	832b4c0a86	avcodec/libutvideodec: print extradata size if unsupported Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-21 03:05:49 +02:00
Michael Niedermayer	d4e62ebae7	avcodec/snowenc: remove redundant FF_MPV_OFFSET() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-20 04:09:43 +02:00
Clément Bœsch	c669af0f24	avcodec/ass: add ASS trailing \r\n in one single place	2014-10-19 23:24:34 +02:00
Clément Bœsch	3d25869605	avcodec/ass: assume raw=0 in ff_ass_add_rect_bprint	2014-10-19 23:24:34 +02:00
Michael Niedermayer	5c8eb16769	avcodec: add codec_whitelist This allows restricting decoders to a list of needed ones for improved security Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-19 04:36:52 +02:00
Michael Niedermayer	e23af4662d	avcodec/utils: Display pixel format information as none ... if unknown instead of omitting it This is similar to `20a5956b8d` The difference this change makes affects only rather few files but looks like: Stream #0:1: Video: mjpeg, 90k tbr, 90k tbn, 90k tbc vs. Stream #0:1: Video: mjpeg, none(bt470bg/unknown/unknown), 90k tbr, 90k tbn, 90k tbc Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-19 04:18:13 +02:00
Michael Niedermayer	765abb3b76	avcodec/libvpxenc: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-19 03:04:04 +02:00
Michael Niedermayer	c5e295cb9d	avcodec/mpegaudiodec_template: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-19 03:03:40 +02:00
Michael Niedermayer	993a2487de	avcodec/nellymoserenc: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-19 03:03:04 +02:00
Michael Niedermayer	f4445c7be4	avcodec/wmv2enc: add priv_class Fixes ratecontrol code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-18 20:06:29 +02:00
Michael Niedermayer	bf301258b4	avcodec/snowenc: add FF_MPV_COMMON_OPTS This fixes the ratecontrol code with snow adding FF_MPV_COMMON_OPTS is needed as the generic rate control options are currently in the (unrelated) MpegEncContext Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-18 19:41:48 +02:00
Michael Niedermayer	25f4e9387d	Merge commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45' * commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45': lavc: make lmax/lmin into private options of mpegvideo encoders Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-18 19:23:00 +02:00
Michael Niedermayer	ae6ba2db8f	avcodec/mjpegenc: add priv_class to encoders Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-18 19:13:20 +02:00
Michael Niedermayer	709ab39cb9	Merge commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40' * commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40': lavc: make border_masking into private options of mpegvideo encoders Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-18 15:58:55 +02:00
Michael Niedermayer	1a5871d1be	Merge commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866' * commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866': lavc: deprecate unused mb_threshold field Conflicts: libavcodec/options_table.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-18 15:42:29 +02:00
Michael Niedermayer	8be1120deb	Merge commit '685be3d1aecf965281128f3b631ed965bcfa754d' * commit '685be3d1aecf965281128f3b631ed965bcfa754d': libvpxenc: add static-thresh private option Conflicts: libavcodec/libvpxenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-18 15:33:57 +02:00
Michael Niedermayer	c48e8d9dca	Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283' * commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283': lavc: deprecate unused me_threshold field Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-18 15:04:42 +02:00
Michael Niedermayer	fc67d937cc	Merge commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6' * commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6': lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of mpegvideo encoders Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-18 14:18:41 +02:00
Michael Niedermayer	ec8f56efad	Merge commit 'a75c2eb25a62105c09b48521aef429dc8a231637' * commit 'a75c2eb25a62105c09b48521aef429dc8a231637': lavc: make rc_eq into private options of mpegvideo encoders Conflicts: libavcodec/options_table.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-18 14:06:15 +02:00
Michael Niedermayer	17a065cf20	Merge commit '946f95354ba76ef73c9b66889d86ab5fba4fb486' * commit '946f95354ba76ef73c9b66889d86ab5fba4fb486': lavc: make rc_qmod_* into private options of mpegvideo encoders Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-18 13:52:06 +02:00
Michael Niedermayer	7412835204	Merge commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf' * commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf': lavc: make rc_qsquish a private option of mpegvideo encoders Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-18 13:30:38 +02:00
Anton Khirnov	530c1441fd	lavc: make lmax/lmin into private options of mpegvideo encoders	2014-10-18 05:29:14 +02:00
Anton Khirnov	15ec053c4c	lavc: make border_masking into private options of mpegvideo encoders	2014-10-18 05:28:40 +02:00
Anton Khirnov	c4f7bee087	lavc: deprecate unused mb_threshold field	2014-10-18 05:28:29 +02:00
Anton Khirnov	685be3d1ae	libvpxenc: add static-thresh private option Currently, this option is accessed through AVCodecContext.mb_threshold, which originally controlled reusing MB data when transcoding mpeg to mpeg. Since the libvpx meaning is completely different from the original mpegvideo meaning, it is better to use a separate private option for this.	2014-10-18 05:28:03 +02:00
Anton Khirnov	59b55c494e	lavc: deprecate unused me_threshold field	2014-10-18 05:26:56 +02:00
Anton Khirnov	66a68ddd1a	lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of mpegvideo encoders	2014-10-18 05:26:29 +02:00
Anton Khirnov	a75c2eb25a	lavc: make rc_eq into private options of mpegvideo encoders	2014-10-18 05:23:51 +02:00
Anton Khirnov	946f95354b	lavc: make rc_qmod_* into private options of mpegvideo encoders	2014-10-18 05:23:05 +02:00
Anton Khirnov	a6e4ce9fd5	lavc: make rc_qsquish a private option of mpegvideo encoders	2014-10-18 05:21:50 +02:00
Michael Niedermayer	0b0d47e4b2	Merge commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4' * commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4': dump: display codec tags when available Conflicts: libavcodec/utils.c See: `d2d7b7134f` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-17 21:13:01 +02:00
Michael Niedermayer	45fed258ee	Merge commit '66e9f839536238945fbfe9d2041b6891cb150e45' * commit '66e9f839536238945fbfe9d2041b6891cb150e45': libfdk-aacdec: Enable Dynamic Range Control Metadata Support Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-17 20:45:43 +02:00
Michael Niedermayer	e18fc35a07	avcodec/libfdk-aacdec: use av_feeep() to avoid leaving stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-17 20:36:14 +02:00
Michael Niedermayer	5a1aa55905	Merge commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93' * commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93': libfdk-aacdec: Enable Decoder Downmix including Downmix Metadata Support Conflicts: libavcodec/libfdk-aacdec.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-17 20:35:43 +02:00
Vittorio Giovara	bae557edce	dump: display codec tags when available For both audio and video.	2014-10-17 14:45:07 +01:00
Omer Osman	66e9f83953	libfdk-aacdec: Enable Dynamic Range Control Metadata Support For streams which contain DRC metadata, the FDK decoder is able to control rendering of the decoded output. The rendering parameters are detailed in fdk_aac_dec_options []. The default behavior is left up to the decoder. Signed-off-by: Martin Storsjö <martin@martin.st>	2014-10-17 15:48:31 +03:00
Omer Osman	b01a2204b5	libfdk-aacdec: Enable Decoder Downmix including Downmix Metadata Support The FDK decoder is capable of producing mono and stereo downmix from multichannel streams. These streams may contain metadata that control the downmix process. The decoder requires an Ancillary Buffer in order to correctly apply downmix in streams containing downmix Metadata. The decoder does not have an API interface to inform of the presence of Metadata in the stream, and therefore the Ancillary Buffer is always allocated whenever a downmix is requested. When downmixing multichannel streams, the decoder requires the output buffer in aacDecoder_DecodeFrame call to be of fixed size in order to hold the actual number of channels contained in the stream. For example, for a 5.1ch to stereo downmix, the decoder requires that the output buffer is allocated for 6 channels, regardless of the fact that the output is in fact two channels. Due to this requirement, the output buffer is allocated for the maximum output buffer size in case a downmix is requested (and also during decoder init). When a downmix is requested, the buffer used for output during init will also be used for the entire duration the decoder is open. Otherwise, the initial decoder output buffer is freed and the decoder decodes straight into the output AVFrame. Signed-off-by: Martin Storsjö <martin@martin.st>	2014-10-17 15:48:30 +03:00
Carl Eugen Hoyos	392b4b663c	Fix initialisers in dct-test.c. Silences a warning when running fate on unusual platforms: libavcodec/dct-test.c:101:21: warning: missing braces around initializer [-Wmissing-braces] libavcodec/dct-test.c:101:21: warning: (near initialization for 'fdct_tab_arch[0]') [-Wmissing-braces] libavcodec/dct-test.c:102:21: warning: missing braces around initializer [-Wmissing-braces] libavcodec/dct-test.c:102:21: warning: (near initialization for 'idct_tab_arch[0]') [-Wmissing-braces]	2014-10-16 12:01:26 +02:00
Michael Niedermayer	7b6a97edd1	avcodec/avcodec: more verbose documentation for time_base Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-16 00:28:57 +02:00
Michael Niedermayer	2f7bd04afb	avcodec/avcodec: fix non doxy comment Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-16 00:10:38 +02:00
Michael Niedermayer	cacc1dcadc	Merge commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d' * commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d': imc: fix order of operations in coefficients read Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-15 21:25:10 +02:00
Clément Bœsch	52b0a0ecaa	avcodec/ass: add FFmpeg signature	2014-10-15 19:25:06 +02:00
Clément Bœsch	462f2876ce	avcodec/ass_split: realign after addition of new fields	2014-10-15 19:25:06 +02:00
Clément Bœsch	3e86ead383	avcodec/ass_split: assume default order when "Format:" line is not found Fixes the decoding of the ASS stream in a mkv from a fansub release from Coalgirls.	2014-10-15 19:25:06 +02:00
Clément Bœsch	d9f272fe33	avcodec/ass_split: extend recognized fields in ASS splitter This simplifies the logic for the fix in the next commit.	2014-10-15 19:25:06 +02:00
Clément Bœsch	40b9f28641	avcodec/ass: output missing fields in AVSubtitles and output files Fixes Ticket #3207	2014-10-15 19:25:06 +02:00
Michael Niedermayer	18255441dd	avcodec/dpx: fix framerate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-15 16:08:36 +02:00
Michael Niedermayer	220a15c074	avcodec/vc1: fix time_base and framerate They are not just inverses of each other. This should restore behavior to before the introduction of framerate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-15 16:08:36 +02:00
Michael Niedermayer	09450c5509	avcodec/h264: fix time_base and framerate They are not just inverses of each other. This should restore behavior to before the introduction of framerate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-15 16:08:36 +02:00
Michael Niedermayer	620e7f0f3b	avcodec/mpeg12dec: fix time_base and framerate They are not just inverses of each other. This should restore behavior to before the introduction of framerate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-15 15:54:02 +02:00
Michael Niedermayer	801876fb07	avcodec/utils: fix time_base after the framerate addition time_base != 1/framerate for example for interlaced video Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-15 15:52:35 +02:00
Michael Niedermayer	17085a0251	Merge commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41' * commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41': lavc: deprecate the use of AVCodecContext.time_base for decoding Conflicts: libavcodec/avcodec.h libavcodec/h264.c libavcodec/mpegvideo_parser.c libavcodec/utils.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-15 15:49:31 +02:00
Vittorio Giovara	1ac5a29b2e	imc: fix order of operations in coefficients read Reported-by: Ruoyu <liangry@ucweb.com>	2014-10-15 14:48:07 +01:00
Michael Niedermayer	51c810e62b	Merge commit 'd565fef1b83b6c5f8afb32229260b79f67c68109' * commit 'd565fef1b83b6c5f8afb32229260b79f67c68109': vdpau: add AV_HWACCEL_FLAG_IGNORE_LEVEL to skip the codec level check Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-15 12:30:07 +02:00
Michael Niedermayer	fd937866f7	Merge commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193' * commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193': vdpau: have av_vdpau_bind_context() fail on unsupported flag Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-15 12:17:59 +02:00
Anton Khirnov	7ea1b3472a	lavc: deprecate the use of AVCodecContext.time_base for decoding When decoding, this field holds the inverse of the framerate that can be written in the headers for some codecs. Using a field called 'time_base' for this is very misleading, as there are no timestamps associated with it. Furthermore, this field is used for a very different purpose during encoding. Add a new field, called 'framerate', to replace the use of time_base for decoding.	2014-10-15 06:37:43 +00:00
Rémi Denis-Courmont	d565fef1b8	vdpau: add AV_HWACCEL_FLAG_IGNORE_LEVEL to skip the codec level check Decoding acceleration may work even if the codec level is higher than the stated limit of the VDPAU driver. Or the problem may be considered acceptable by the user. This flag allows skipping the codec level capability checks and proceed with decoding. Applications should obviously not set this flag by default, but only if the user explicitly requested this behavior (and presumably knows how to turn it back off if it fails). Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-10-15 06:21:56 +00:00
Rémi Denis-Courmont	c1724623ce	vdpau: have av_vdpau_bind_context() fail on unsupported flag Currently, no flags are supported. Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-10-15 06:21:47 +00:00
Michael Niedermayer	f43ac02723	avcodec/iirfilter: Make ff_iir_filter_free_state() also zero the freed pointer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-14 20:46:15 +02:00
Michael Niedermayer	43fb16cf74	avcodec/iirfilter: Change ff_iir_filter_free_coeffs() so it clears the pointers as well Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-14 18:30:52 +02:00
Michael Niedermayer	9946da4976	avcodec/flac_parser: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-14 18:30:31 +02:00
Michael Niedermayer	fd367668e1	avcodec/flac_parser: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-14 18:29:49 +02:00
Michael Niedermayer	320ce9f284	avcodec/ac3enc_template: use the initial_padding field Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-14 02:46:51 +02:00
Michael Niedermayer	da2189596d	Merge commit '2df0c32ea12ddfa72ba88309812bfb13b674130f' * commit '2df0c32ea12ddfa72ba88309812bfb13b674130f': lavc: use a separate field for exporting audio encoder padding Conflicts: libavcodec/audio_frame_queue.c libavcodec/avcodec.h libavcodec/libvorbisenc.c libavcodec/utils.c libavcodec/version.h libavcodec/wmaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-14 02:16:16 +02:00
Michael Niedermayer	1f20fa2da8	avcodec/aacdec: print element types when debug startcode is set Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-14 01:54:57 +02:00
Michael Niedermayer	b9918a7688	Merge commit 'c80a816142699dea9cf9fa66689a7838a487ed7e' * commit 'c80a816142699dea9cf9fa66689a7838a487ed7e': h263dec: call get_format() on resolution changes Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-14 00:04:18 +02:00
Michael Niedermayer	d3d265bae2	Merge commit '1f29e5d7a2b0950f3b6820896e97e2c02e6a10a9' * commit '1f29e5d7a2b0950f3b6820896e97e2c02e6a10a9': h263dec: call get_format after setting resolution and profile Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-13 22:13:04 +02:00
Anton Khirnov	2df0c32ea1	lavc: use a separate field for exporting audio encoder padding Currently, the amount of padding inserted at the beginning by some audio encoders, is exported through AVCodecContext.delay. However - the term 'delay' is heavily overloaded and can have multiple different meanings even in the case of audio encoding. - this field has entirely different meanings, depending on whether the codec context is used for encoding or decoding (and has yet another different meaning for video), preventing generic handling of the codec context. Therefore, add a new field -- AVCodecContext.initial_padding. It could conceivably be used for decoding as well at a later point.	2014-10-13 19:09:01 +00:00
Benoit Fouet	4da7111eb8	avcodec/aacdec: map LFE[0] to SCE[1] for 4.0 audio. Fixes ticket #3930 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-13 17:50:20 +02:00
Rémi Denis-Courmont	c80a816142	h263dec: call get_format() on resolution changes Fail safe if the pixel format changes.	2014-10-13 16:05:04 +02:00
Rémi Denis-Courmont	1f29e5d7a2	h263dec: call get_format after setting resolution and profile Bug-Id: 541	2014-10-13 16:04:53 +02:00
Paul B Mahol	a586b3d9b1	libavcodec/libtwolame: fix null pointer dereference Signed-off-by: Paul B Mahol <onemda@gmail.com>	2014-10-13 12:22:41 +00:00
Michael Niedermayer	acea53fea0	avcodec/eatgv: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-12 12:22:28 +02:00
Michael Niedermayer	28b829b8bb	avcodec/eatqi: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-12 12:22:16 +02:00
Michael Niedermayer	20df02680c	avcodec/error_resilience: avoid pointer arithmetic with NULL move the code after the existing NULL check Fixes: signal_sigsegv_844d59_10_signal_sigsegv_a17bb7_366_mpegts_mpeg2video_mp2_dvbsub_topfield.rec Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-12 04:49:08 +02:00
Michael Niedermayer	0db1f2c2c7	avcodec/mjpegdec: sanity check bits Fixes undefined shift Fixes: asan_heap-oob_16668e9_2_asan_heap-oob_16668e9_346_miss_congeniality_pegasus_mjpg.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-12 00:28:07 +02:00
Michael Niedermayer	e24e5986a6	avcodec/dct: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-11 22:51:33 +02:00
Michael Niedermayer	3521c70dab	avcodec/dirac_parser: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-11 22:51:15 +02:00
Michael Niedermayer	c712d240b1	avcodec/eamad: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-11 22:50:51 +02:00
Christophe Gisquet	140f535517	proresenc_ks: use chroma sampling in autoselection If the chroma planes aren't subsampled, automatically select the 4:4:4:4 profile. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-11 16:47:19 +02:00
Michael Niedermayer	b8a55994f0	avcodec/mpeg12dec: print aspect_ratio_info in debug output Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-11 03:22:16 +02:00
Christophe Gisquet	cb530dda7d	utvideoenc: properly set slice height/last line Mimic decoder and obey sampling. Does not affect fate tests for utvideo. Fixes ticket #3949. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-10 20:08:24 +02:00
Michael Niedermayer	ea77d3b889	avcodec/atrac3: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-10 17:10:02 +02:00
Michael Niedermayer	3537ddb76f	avcodec/cavs: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-10 17:09:46 +02:00
Rong Yan	0d71bd5a94	libavcodec/ppc/hpeldsp_altivec.c : fix ff_put_pixels16_altivec() for POWER LE Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-10 14:24:22 +02:00
Rong Yan	c1fa5d1bd4	libavcodec/ppc/me_cmp.c : fix sad16_altivec() sse16_altivec() sad16_xy2_altivec() sad16_x2_altivec() sad16_y2_altivec() sad8_altivec() for POWER LE Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-10 14:24:22 +02:00
Di Wu	162b521108	vp9: enable multi-thread decoding when refreshctx is equal to 0 In vp9_decode_frame function, ff_thread_finish_setup is not called when refreshctx is equal to 0, and the next decoding thread can not start work until the cunrrent frame has been decoded completely. So ff_thread_finish_setup needs to be called to enable Multi-thread decoding in this condition. Signed-off-by: Di Wu <di1028.wu@samsung.com> Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>	2014-10-10 09:13:44 -03:00
Rong Yan	c5ca76ad3b	libavcodec/ppc/mpegvideoencdsp.c : fix pix_norm1_altivec() and pix_sum_altivec() for POWER LE Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-10 13:32:02 +02:00
Rong Yan	31dea05170	libavcodec/ppc/pixblockdsp.c : fix get_pixels_altivec() and diff_pixels_altivec() for POWER LE Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-10 13:31:49 +02:00
Michael Niedermayer	8cfb9ccfef	avcodec/utils: Fix "warning: pointer type mismatch in conditional expression" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-09 05:46:13 +02:00
Michael Niedermayer	f9a1317479	avcodec/utils: Add missing AV_PIX_FMT_YUVJ411P to color_range override code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-09 05:28:10 +02:00
Michael Niedermayer	cf7b90dea2	fix seperator typo Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-09 04:19:13 +02:00
Michael Niedermayer	f6777ce6fe	Merge commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7' * commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7': vc1: initialize color properties See: `ddabecbbf5` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-09 03:06:20 +02:00
Michael Niedermayer	5b134a0544	Merge commit 'eddf95283fbba1b469b76e7518bc3941f671b193' * commit 'eddf95283fbba1b469b76e7518bc3941f671b193': vp9: initialize color space and range properties Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-09 02:49:16 +02:00
Michael Niedermayer	3bc86462a2	Merge commit '65875a8b3b079752da25a61ec188d2e3d90a569f' * commit '65875a8b3b079752da25a61ec188d2e3d90a569f': vp8: initialize color space and range properties Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-09 02:36:58 +02:00
Michael Niedermayer	6414c3ecd0	Merge commit '586ea0379c207a942c1f2d61e0b3a63c458cc598' * commit '586ea0379c207a942c1f2d61e0b3a63c458cc598': avcodec: fix colorspace option description Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-09 02:23:15 +02:00
Michael Niedermayer	923a242282	Merge commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b' * commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b': avcodec: add enum values on chroma sample location Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-09 02:14:54 +02:00
Michael Niedermayer	7652b176fc	Merge commit '9d5fed6dc4cccb0689f694112f5026988bebc472' * commit '9d5fed6dc4cccb0689f694112f5026988bebc472': avcodec: fix descriptions on color transfer options Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-09 02:14:23 +02:00
Michael Niedermayer	5f43a7957b	Merge commit '9f3a70c44224ed92d91df65bb9470a2649e7d019' * commit '9f3a70c44224ed92d91df65bb9470a2649e7d019': dump: print the original coded dimensions when available Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-09 01:46:26 +02:00
Michael Niedermayer	af28960412	Merge commit '41e86146e7240f9d42e8cdb86a94bb3eb2bbe15f' * commit '41e86146e7240f9d42e8cdb86a94bb3eb2bbe15f': dump: print detailed color space information full color triplets are only printed if they are not all equal, otherwise they are printed as before Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-09 01:26:34 +02:00
Michael Niedermayer	e051d09c58	avcodec: Allow choosing the dump format field separator. The default is to maintain the previous ", " for now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-09 00:56:31 +02:00
Michael Niedermayer	f22f873ef0	Merge commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8' * commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8': dump: split audio and video probing on multiple lines Conflicts: libavcodec/utils.c libavformat/dump.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-09 00:56:23 +02:00
Michael Niedermayer	10dd62737e	Merge commit '147f2e91eece6b9021ff5b7f8a3b5ce053566659' * commit '147f2e91eece6b9021ff5b7f8a3b5ce053566659': avcodec: make sure color_range is properly initialized Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-08 22:08:11 +02:00
Michael Niedermayer	d5a3caef93	Merge commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576' * commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576': vc1: Split the decoder in components Conflicts: libavcodec/Makefile libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-08 22:00:09 +02:00
Vittorio Giovara	1a02e78653	vc1: initialize color properties	2014-10-08 18:17:50 +01:00
Vittorio Giovara	eddf95283f	vp9: initialize color space and range properties	2014-10-08 18:17:50 +01:00
Vittorio Giovara	65875a8b3b	vp8: initialize color space and range properties	2014-10-08 18:17:50 +01:00
Vittorio Giovara	586ea0379c	avcodec: fix colorspace option description	2014-10-08 18:17:50 +01:00
Marc-Antoine Arnaud	91eef40203	avcodec: add enum values on chroma sample location	2014-10-08 18:17:50 +01:00
Marc-Antoine Arnaud	9d5fed6dc4	avcodec: fix descriptions on color transfer options Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>	2014-10-08 18:17:49 +01:00
Vittorio Giovara	9f3a70c442	dump: print the original coded dimensions when available	2014-10-08 18:17:49 +01:00
Vittorio Giovara	41e86146e7	dump: print detailed color space information	2014-10-08 18:17:49 +01:00
Vittorio Giovara	20a5956b8d	dump: split audio and video probing on multiple lines Also always report pixel format.	2014-10-08 18:17:49 +01:00
Vittorio Giovara	147f2e91ee	avcodec: make sure color_range is properly initialized	2014-10-08 18:17:49 +01:00
Luca Barbato	04d14c9b68	vc1: Split the decoder in components Speed up the overall compilation time.	2014-10-08 18:34:48 +02:00
Michael Niedermayer	f703c8cc09	avcodec/avpicture: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-08 16:09:31 +02:00
Michael Niedermayer	fa8c6c1350	avcodec/atrac3plusdec: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-08 16:09:23 +02:00
Michael Niedermayer	f66fed6c42	avcodec/bfi: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-08 16:08:28 +02:00
Michael Niedermayer	b530e2e351	avcodec/vorbisdec: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-08 15:17:27 +02:00
Michael Niedermayer	3c1378ce0a	Merge commit '2d91abade29e43bb45c881d45909b8ee77e904e2' * commit '2d91abade29e43bb45c881d45909b8ee77e904e2': x86: h264_intrapred: Don't treat 32-bit integers as 64-bit Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-08 11:48:58 +02:00
Henrik Gramner	2d91abade2	x86: h264_intrapred: Don't treat 32-bit integers as 64-bit The upper halves are not guaranteed to be zero in x86-64. Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-10-08 08:15:52 +00:00
James Almer	82f8eb5f77	jpeg2000: split off inverse MCT as Jpeg2000DSP This makes the addition of arch optimized functions easier. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-10-08 08:02:55 +00:00
Michael Niedermayer	f3296b9454	avcodec/h264: Undefined behavior (left shift of 12852653 by 8 places cannot be represented in type 'int') Fixes: asan_heap-oob_84f75d_8_asan_heap-oob_a2a00a_341_mbc.ts Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-08 05:35:10 +02:00
Michael Niedermayer	9db9b209e3	avcodec/mmvideo: Fix undefined behavior (left shift of negative value) Fixes: asan_heap-oob_4da4f3_8_asan_heap-oob_4da4f3_419_scene1a.mm Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-08 05:35:01 +02:00
Michael Niedermayer	aba873bbd0	Merge commit '9a03c2323593173a201cb75edd1b49887cf811ed' * commit '9a03c2323593173a201cb75edd1b49887cf811ed': h263dec: Force padding bug workaround for H.263. This is not merged as it breaks a good part of the error concealment/resilience for H.263 Also, messenger.h263 plays fine in ffmpeg. If anyone has any other h263 files that do not work, please open an issue on trak or mail me! See: `d225b0f7aa` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-07 13:00:08 +02:00
Michael Niedermayer	33c8500db4	Merge commit 'd208d1eba3799c58fd6d3602d31de3e686f14aec' * commit 'd208d1eba3799c58fd6d3602d31de3e686f14aec': hevc_mvs: make sure to always initialize the temporal MV fully Conflicts: libavcodec/hevc_mvs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-07 12:29:07 +02:00
Michael Niedermayer	018ca8b7f6	Merge commit '79a60c8e779242b5ba4c531b2c706c871e8e6420' * commit '79a60c8e779242b5ba4c531b2c706c871e8e6420': hevc_mvs: initialize the temporal MV in case of missing ref Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-07 12:21:43 +02:00
Josh Allmann	9a03c23235	h263dec: Force padding bug workaround for H.263. Fixes decoding of http://samples.mplayerhq.hu/V-codecs/h263/h263-raw/messenger.h263 Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-10-07 07:30:32 +00:00
Anton Khirnov	d208d1eba3	hevc_mvs: make sure to always initialize the temporal MV fully The spec requires this. Fixes uninitialized reads on some samples. Remove now unnecessary initialization of the whole merge candidate list.	2014-10-07 07:13:01 +00:00
Anton Khirnov	79a60c8e77	hevc_mvs: initialize the temporal MV in case of missing ref The caller expects the MV to always be initialized.	2014-10-07 07:12:55 +00:00
Michael Niedermayer	f0d1b3acdf	avcodec/escape124: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-07 03:42:20 +02:00
Michael Niedermayer	1c5647f419	avcodec/proresenc_kostya: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-07 03:41:40 +02:00
Michael Niedermayer	c9eac8062e	avcodec/avpacket: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-07 03:40:57 +02:00
Michael Niedermayer	b60938e4fd	avcodec/avpacket: simplify freeing pkt->data Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-07 03:40:15 +02:00
Michael Niedermayer	a52384dcda	Merge commit '153fadc390d05aa47e5e2c56290401898fe41a23' * commit '153fadc390d05aa47e5e2c56290401898fe41a23': ff_get_format: fix infinite loop Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-07 02:15:26 +02:00
Michael Niedermayer	d47dd84391	Merge commit '577899a6458ccad9026eb268f10dc0b39c224c8d' * commit '577899a6458ccad9026eb268f10dc0b39c224c8d': lavc: specify the behavior of av_lockmgr_register on failure. Conflicts: libavcodec/avcodec.h libavcodec/utils.c libavcodec/version.h See: `a950edb472` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-06 21:08:55 +02:00
Rémi Denis-Courmont	153fadc390	ff_get_format: fix infinite loop Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-10-06 18:39:45 +00:00
Manfred Georg	577899a645	lavc: specify the behavior of av_lockmgr_register on failure. The register function now specifies that the user callback should leave things in the same state that it found them on failure but that failure to destroy is ignored by the library. The register function is now explicit about its behavior on failure (it unregisters the previous callback and destroys all mutex). Signed-off-by: Manfred Georg <mgeorg@google.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-10-06 18:20:17 +00:00
Michael Niedermayer	67ddf21611	avcodec/vdpau: do not dereference hwctx before checking it for NULL Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-06 17:39:28 +02:00
Michael Niedermayer	0e57c05118	avcodec/vdpau: fix render2() check Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-06 16:23:36 +02:00
Michael Niedermayer	573d333010	Merge commit 'bef067f88c74190cdf7e76d12f02e12e069974aa' * commit 'bef067f88c74190cdf7e76d12f02e12e069974aa': vdpau: check video surface and decoder capabilities Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-06 15:12:19 +02:00
Michael Niedermayer	a61899a0f1	Merge commit 'e3e158e81f0666b8fe66be9ce1cad63a535920e0' * commit 'e3e158e81f0666b8fe66be9ce1cad63a535920e0': vdpau: add av_vdpau_bind_context() Conflicts: doc/APIchanges libavcodec/vdpau.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-06 15:04:03 +02:00
Michael Niedermayer	067d11bf71	Merge commit '502cde409ca5ee97ef70c2cdede88b9101746ff6' * commit '502cde409ca5ee97ef70c2cdede88b9101746ff6': vdpau: force reinitialization when output resolution changes Conflicts: libavcodec/vdpau.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-06 14:17:40 +02:00
Michael Niedermayer	ec6a855b3a	avcodec/vdpau: warn if the user application has not setup avctx->hwaccel_context instead of potentially crashing Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-06 14:10:37 +02:00
Michael Niedermayer	0ba887bbf4	Merge commit '89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4' * commit '89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4': vdpau: pass codec-specific parameters from hwaccel Conflicts: libavcodec/vdpau.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-06 13:21:52 +02:00
Michael Niedermayer	8df41976b7	avcodec/vdpau_internal: add comment to #endif Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-06 12:47:08 +02:00
Michael Niedermayer	10b6d7462c	Merge commit 'ce083282f0a8b7d63c4047c30b7bac498f9806dd' * commit 'ce083282f0a8b7d63c4047c30b7bac498f9806dd': vdpau: common support for managing the VdpDecoder in avcodec Conflicts: libavcodec/vdpau.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-06 12:38:26 +02:00
Michael Niedermayer	b64b719ad5	Merge commit 'fcc1022611f79c2f3aa2f392a5ce14c74be9c1d7' * commit 'fcc1022611f79c2f3aa2f392a5ce14c74be9c1d7': vdpau: factor out common end-of-frame handling Conflicts: libavcodec/vdpau.c libavcodec/vdpau_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-06 12:09:17 +02:00
Michael Niedermayer	567c0dcee6	Merge commit '319424d25c53f82b87187ce03ed984d438f1bee6' * commit '319424d25c53f82b87187ce03ed984d438f1bee6': vdpau: add helper for VDPAU to libav error codes conversion Conflicts: libavcodec/vdpau.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-06 11:38:06 +02:00
Rémi Denis-Courmont	bef067f88c	vdpau: check video surface and decoder capabilities Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-10-06 06:20:40 +00:00
Rémi Denis-Courmont	e3e158e81f	vdpau: add av_vdpau_bind_context() This function provides an explicit VDPAU device and VDPAU driver to libavcodec, so that the application is relieved from codec specifics and VdpDevice life cycle management. A stub flags parameter is added for future extension. For instance, it could be used to ignore codec level capabilities (if someone feels dangerous). Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-10-06 06:20:40 +00:00
Rémi Denis-Courmont	502cde409c	vdpau: force reinitialization when output resolution changes This is necessary to recreate the decoder with the correct parameters, as not all codecs invoke get_format() in this case. Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-10-06 06:18:56 +00:00
James Almer	42111bb960	avcodec: remove obsolete FF_API_FAST_MALLOC cruft Signed-off-by: James Almer <jamrial@gmail.com>	2014-10-05 17:09:44 -03:00
Benoit Fouet	904cfd257d	avcodec/h264_mp4toannexb_bsf: reset the new IDR flag when SPS/PPS is seen. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-10-05 14:47:04 +02:00

... 7 8 9 10 11 ...

30817 Commits