RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
70,733 Commits 36 Branches 398 Tags 244 MiB
Commit Graph

70733 Commits

Author SHA1 Message Date
Michael Niedermayer 10e3e3aa85 Merge commit '62de77ffcaebd42fe685b8426da56b89b2532318' 
* commit '62de77ffcaebd42fe685b8426da56b89b2532318':
  vorbis: Use a local codebook variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-08 18:59:06 +01:00
Martin Storsjö 6448f15af0 mxfdec: Fix the error handling for when strftime fails 
The str variable is a char ** here.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-03-08 18:40:43 +02:00
Michael Niedermayer 8fabbd0dcf doc/filters: Add some random examples for fftfilt 
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-08 15:02:49 +01:00
Ronald S. Bultje 0b69c53a61 vp9: included uses_2pass member in vp9_ref_frame(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-08 14:50:11 +01:00
Luca Barbato 5f5b78aca3 xcbgrab: Free the host string after checking the connection 
Prevent an use after free in the error message.

Bug-Id: CID 1274040
CC: libav-stable@libav.org
 2015-03-08 14:39:01 +01:00
Luca Barbato 0025f7408a vorbis: Check the vlc value in setup_classifs 
The valid returned values are always at most 11bit.
Remove the previous check that assumed larger values plausible and
use a signed integer to check get_vlc2 return values.

CC: libav-stable@libav.org
 2015-03-08 14:33:03 +01:00
Luca Barbato 62de77ffca vorbis: Use a local codebook variable 
Makes the code a little simpler.
 2015-03-08 14:33:02 +01:00
Ronald S. Bultje 4ba8f3273e vp9: split segmentation map / mvpair references. 
This prevents a memcpy if segmentation.update_map == false.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-08 13:58:14 +01:00
Paul B Mahol 0c49cff117 avfilter/af_astats: redo zero channel handling 
Suggested-by: Nicolas George
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-03-08 11:06:45 +00:00
Michael Niedermayer fc9b407487 Merge commit '0f9f7969ef4df3661131cede3e8cc770e1ea3db8' 
* commit '0f9f7969ef4df3661131cede3e8cc770e1ea3db8':
  rmdec: Improve message for demux error

See: 3880b4541a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-08 11:40:00 +01:00
Martin Vignali 65ba90eac6 avfilter/af_astats: Avoid Zero division in print part. 2015-03-08 08:47:27 +00:00
Carl Eugen Hoyos 0f9f7969ef rmdec: Improve message for demux error 
Use correct context, reduce log level, don't assume it is a video stream,
and print the tag of the unknown stream.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-03-08 02:35:04 +00:00
zhaoxiu.zeng 9d7e42e65c avcodec/vc1_mc: optimize get_chroma_mv, and add get_luma_mv 
Test results:

before:
  fate-suite/vc1/SA10091.vc1: 1062 decicycles in ff_vc1_mc_4mv_chroma's get mv, 4089 runs, 7 skips
  fate-suite/vc1/SA10143.vc1: 1112 decicycles in ff_vc1_mc_4mv_luma's get mv, 4096 runs, 0 skips
  fate-suite/vc1/SA20021.vc1: 991 decicycles in ff_vc1_mc_4mv_chroma get mv, 8192 runs, 0 skips

after:
  fate-suite/vc1/SA10091.vc1: 940 decicycles in ff_vc1_mc_4mv_chroma's get mv, 4096 runs, 0 skips
  fate-suite/vc1/SA10143.vc1: 786 decicycles in ff_vc1_mc_4mv_luma's get mv, 4096 runs, 0 skips
  fate-suite/vc1/SA20021.vc1: 876 decicycles in ff_vc1_mc_4mv_chroma get mv, 8189 runs, 3 skips

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-08 03:04:32 +01:00
Michael Niedermayer 8849c4ceac avcodec/mpegvideo_motion: Fix off by 1 error in MV bounds checking in qpel, chroma_4mv and 8x8 
No testcase available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-08 01:46:50 +01:00
Michael Niedermayer 9f0eaf792a avcodec/mpegvideo_motion: Fix off by 1 error in MV bounds checking 
Fixes Ticket4299

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-08 01:27:56 +01:00
Michael Niedermayer 6c583e9048 avcodec/opusdec: Fix delayed sample value 
Fixes out of array access
Fixes: ffmpeg_opus_crash1.ogg

This solution is likely not optimal in terms of error concealment but
its simple and fixes the out of array access.

Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Tested-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-07 21:39:23 +01:00
Michael Niedermayer 1ae092587f avcodec/opusdec: Clear out pointers per packet 
This is safer than to assume that all error pathes cleared them and
nothing will use uncleared pointers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-07 21:39:20 +01:00
Michael Niedermayer e3201c38d5 avcodec/utils: Align YUV411 by as much as the other YUV variants 
Fixes out of array accesses
Fixes: ffmpeg_mjpeg_crash2.avi

Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Tested-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-07 21:39:09 +01:00
zhaoxiu.zeng 9870c03615 avcodec/vc1_mc: change the type of s_rndtblfield to uint8_t 
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-07 21:35:14 +01:00
zhaoxiu.zeng 468defc57b avcodec/vc1_mc: Simplify v_edge_pos and src_y correction when fieldmv is true 
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-07 21:06:21 +01:00
Zeng Zhaoxiu 02fc168c93 avcodec/golomb: cleanup 
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-07 20:18:32 +01:00
Xiangyu Liu b1e9634c10 ChangeLog: Remove the redundant VP9 RTP entry 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-07 20:14:39 +01:00
Michael Niedermayer a75353e73b Merge commit 'b77e335e441040a40fc6156b8e4a134745d10233' 
* commit 'b77e335e441040a40fc6156b8e4a134745d10233':
  configure: Move the .object_arch check to the right place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-07 19:41:00 +01:00
Michael Niedermayer 9a1884a10e Merge commit 'dcae2e32f7d8a1ca5fb8c1e4aa81313be854dd73' 
* commit 'dcae2e32f7d8a1ca5fb8c1e4aa81313be854dd73':
  arm: Suppress tags about used cpu arch and extensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-07 19:30:51 +01:00
Martin Storsjö b77e335e44 configure: Move the .object_arch check to the right place 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-03-07 18:12:58 +02:00
Zeng Zhaoxiu 1be6054261 avcodec/vc1_mc: remove useless variables 
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-07 16:25:29 +01:00
Martin Storsjö dcae2e32f7 arm: Suppress tags about used cpu arch and extensions 
When all the codepaths using manually set .arch/.fpu code is
behind runtime detection, the elf attributes should be suppressed.

This allows tools to know that the final built binary doesn't
strictly require these extensions.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-03-07 17:10:08 +02:00
Arwa Arif 48b5be65ae avfilter: Add FFT domain filter. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-07 13:07:10 +01:00
James Cowgill 3499a1c0a9 mips/asmdefs: change include guard to read AVUTIL_ instead of AVCODEC_ 
Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-07 11:28:03 +01:00
Michael Niedermayer ebd59d271c Revert "avutil/opencl: is_compiled flag not being cleared in av_opencl_uninit" 
Fixed build with opencl enabled
Found-by:  WJ Liu

This reverts commit 0f2359b869.
 2015-03-07 09:59:27 +01:00
Ronald S. Bultje efff3854f0 vp9: fix segmentation map retention with threading enabled. 
Fixes ticket 4359.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-07 03:30:37 +01:00
Michael Niedermayer 6f51cb514b avfilter/vf_colormatrix: Change enums to int, which are accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-07 02:51:02 +01:00
Michael Niedermayer b0662a943c avfilter/f_perms: Change enums to int, which are accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-07 02:45:49 +01:00
Michael Niedermayer 2a34b5099b avfilter/avf_showwaves: Change enums to int, which are accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-07 02:44:04 +01:00
Michael Niedermayer 665d47f435 Merge commit 'cecf45b2bfbb85e9e59f355428fbd4d8cbc652a8' 
* commit 'cecf45b2bfbb85e9e59f355428fbd4d8cbc652a8':
  doc: Add -list_formats all example for video4linux2

Conflicts:
	doc/indevs.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-07 01:16:17 +01:00
Jonas Lindgren cecf45b2bf doc: Add -list_formats all example for video4linux2 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-03-06 23:06:20 +01:00
Peter Tissen 79f83523f7 configure: Make compilable with VS2015 (missing hunk) 
This hunk was missing in the github pull request when i downloaded it,
but is needed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-06 22:45:56 +01:00
Peter Tissen 42493843dc configure: Make compilable with VS2015 
So Visual Studio 2015 has some breaking changes regarding the C
runtime. In short, they made C99 compatable runtime.
Refer to http://blogs.msdn.com/b/vcblog/archive/2014/06/18/crt-features-fixes-and-breaking-changes-in-visual-studio-14-ctp1.aspx

Made-Seriously-Happy: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-06 21:49:00 +01:00
Andreas Cadhalpun 482c86f231 fix spelling errors 
opttimizations -> optimizations
 grabing        -> grabbing
 many resource  -> many resources
 isnt           -> isn't
 silcense       -> silence

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-06 21:35:00 +01:00
Michael Niedermayer 1468ff49df Merge commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e' 
* commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e':
  movenc: Keep writing zero-entry stts atoms as intended

Conflicts:
	libavformat/movenc.c

See: 95165f7c1b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-06 20:57:11 +01:00
Clément Bœsch 70082a1e53 avcodec/samidec: make sure to properly restore parsing context after a tag 2015-03-06 20:39:45 +01:00
Michael Niedermayer b4d89139fb Changelog: Add back "version next" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-06 19:34:05 +01:00
Michael Niedermayer 0bcb6ac150 Add 2.6 to maintained releases 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-06 17:42:36 +01:00
Michael Niedermayer 0b48ddc5f2 doc/APIchanges: Fill in the xx 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-06 16:39:50 +01:00
Michael Niedermayer 34300866a8 doc/APIchanges: Add 2.6 cut marker 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-06 16:20:52 +01:00
Michael Niedermayer 4034e146ba Changelog: rename next to 2.6 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-06 16:19:58 +01:00
Srikanth G 0f2359b869 avutil/opencl: is_compiled flag not being cleared in av_opencl_uninit 
When OpenCL kernels are compiled, is_compiled flag is being set for each
kernel. But, in opencl uninit, this flag is not being cleared.
This causes an error when an OpenCL kernel is tried on different OpenCL
devices on same platform.

Here is the patch with a fix

Reviewed-by; Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-06 15:20:12 +01:00
Martin Storsjö 9731cf4001 movenc: Keep writing zero-entry stts atoms as intended 
a876585215 had the unintended side effect of returning AVERROR(ENOMEM)
when track->entry is zero, while the code intentionally wants to
continue in that case.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-03-06 16:17:48 +02:00
James Cowgill d6f5b3eee3 changelog: add mips 64-bit port 
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-06 14:38:20 +01:00
James Cowgill 157d6f0d5b mips: port optimizations to mips n64 
This mainly consists of replacing all the pointer arithmatic 'addiu'
instructions with PTR_ADDIU which will handle the differences in pointer
sizes when compiled on 64 bit mips systems.

The header asmdefs.h contains the PTR_ macros which expend to the correct mips
instructions to manipulate registers containing pointers.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-06 14:37:44 +01:00