virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
Code Issues Releases Activity
45,775 Commits 37 Branches 400 Tags
Commit Graph

45775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
73581afe01 nutdec: fix integer overflow 
Fixes CID700575
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 20:45:32 +02:00
Michael Niedermayer
d633e15d7d nsvdec: fix division by 0 
Fixes CID717749
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 20:20:39 +02:00
Michael Niedermayer
ee23dcf534 avformat_free_context: allow NULL as argument 
Fixes CID703682
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 20:13:18 +02:00
Michael Niedermayer
830f7f189f mmsh: fix integer overflow in mmsh_seek() 
Fixes CID703745
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 20:13:18 +02:00
Stefano Sabatini
d3b8d56e06 examples/decoding_encoding: prefer 'frame' over 'picture' for an AVFrame 
Decrease confusion.
 2012-10-20 19:42:55 +02:00
Michael Niedermayer
dd84efe3c7 matroskaenc: Fix hypothetical integer overflows 
Fixes CID700562-7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 19:05:15 +02:00
Michael Niedermayer
b1f517f503 matroskaenc: check avio_open_dyn_buf() retuen code 
Fixes CID703629
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 19:05:15 +02:00
Derek Buitenhuis
eed7406416 doc/platform: Add info on shared builds with MSVC 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-10-20 13:00:12 -04:00
Derek Buitenhuis
11a73745d5 doc/platform: Move a caveat down to the notes section 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-10-20 12:59:20 -04:00
Hendrik Leppkes
79393a8363 Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 18:00:13 +02:00
Michael Niedermayer
2c5b92fe90 matroskadec: fix double negation typo 
Fixes CID602563
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 16:58:33 +02:00
Michael Niedermayer
1116491c53 matroska_parse_rm_audio: check for malloc failure 
Fixes CID733712
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 16:55:45 +02:00
Michael Niedermayer
d7cabb3c7e bgmc: check the correct pointers 
Fixes CID90539, CID90538
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 15:33:44 +02:00
Michael Niedermayer
bf52ad1e49 lavc: revert broken hunk from 1cd9c81ddb317ca00061d11d3562d3a34888d91b 
This should fix fate failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 13:59:53 +02:00
Michael Niedermayer
6912e7a008 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: Group math functions into a separate variable
  avutil/mem: K&R formatting cosmetics
  avutil/lzo: K&R formatting cosmetics

Conflicts:
	configure
	libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 13:18:59 +02:00
Michael Niedermayer
04c6ecb7da Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed' 
* commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed':
  fate-vc1: add dependencies
  ARM: fix overreads in neon h264 chroma mc
  rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet
  gitignore: ignore files created by msvc
  fate: Add proper dependencies for the tests in video.mak
  configure: Disable Snow decoder and encoder by default
  lzo: Drop obsolete fast_memcpy reference
  build: Drop OBJS declaration for non-existing PCM_DVD encoder
  mpeg4videodec: Disable frame multithreading for GMC, its not implemented at all

Conflicts:
	libavcodec/mpegvideo.c
	libavformat/rtsp.c
	tests/fate/microsoft.mak
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 12:37:52 +02:00
Stefano Sabatini
cdea54b4c8 lavu/parseutils: rework rational reduction logic in av_parse_ratio() 
Avoid to divide num and den by gcd in case of a parsed expression, since
that is already done in av_d2q(), and force reduction in case of "a:b"
form, allowing to honour the max parameter.

The latter change is consistent with the a/b case, and with the
documentation.
 2012-10-20 12:19:53 +02:00
Stefano Sabatini
935ecfb002 examples/scaling_video: remove unnecessary intermediary variable in fill_yuv_frame() 2012-10-20 12:06:45 +02:00
Stefano Sabatini
7bc533c41b lavc/utils: fix a few case/punctuation inconsistencies in avcodec_open2() 2012-10-20 12:06:20 +02:00
Stefano Sabatini
1cd9c81ddb lavc/utils: extend feedback provided by avcodec_open2() 2012-10-20 12:06:14 +02:00
Stefano Sabatini
7b116a94af examples/decoding_encoding: fix misc typos in the usage text 2012-10-20 11:30:13 +02:00
Stefano Sabatini
8c4753f7f5 examples/decoding_encoding: remove misplaced and confusing comment 2012-10-20 11:30:13 +02:00
Stefano Sabatini
6d6ccbae4c examples/decoding_encoding: add missing checks on avcodec_alloc_context3() 2012-10-20 11:30:13 +02:00
Diego Biurrun
79042ab376 configure: Group math functions into a separate variable 
This avoids some duplication when listing and testing for the functions.
 2012-10-20 02:34:29 +02:00
Diego Biurrun
5532cf3178 avutil/mem: K&R formatting cosmetics 2012-10-20 02:34:29 +02:00
Diego Biurrun
c08536979b avutil/lzo: K&R formatting cosmetics 2012-10-20 02:34:29 +02:00
Mans Rullgard
c9ef43215c fate-vc1: add dependencies 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-20 01:31:01 +01:00
Mans Rullgard
1846ddf0a7 ARM: fix overreads in neon h264 chroma mc 
The loops were reading ahead one line, which could end up outside the
buffer for reference blocks at the edge of the picture.  Removing
this readahead has no measurable performance impact.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-20 01:28:38 +01:00
Hendrik Leppkes
04bf2e7f0e swresample: include ff_log2_tab for shared builds 
This is done in accordance with all other libraries, which no longer access ff_log2_tab from avutil directly for shared builds, and instead obtain their own copy.

This change is required for MSVC DLL builds, as well as avoids accessing a private symbol from another library.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 01:58:04 +02:00
Hendrik Leppkes
953a3dcc4e Mark data symbols shared between libraries with av_export 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 01:56:50 +02:00
Martin Storsjö
2f41eaa9c6 rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-20 01:59:06 +03:00
Hendrik Leppkes
33f2a49423 vc1: only disable interlaced b-frames for software decoding 
Tested-by: Gwenole Beauchesne <gb.devel@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 00:07:43 +02:00
Hendrik Leppkes
b87ff34496 vc1: implement vc1 field interlaced dxva2 decoding 
Tested-by: Gwenole Beauchesne <gb.devel@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 00:07:14 +02:00
Michael Niedermayer
8fb8d539a4 hlsproto: fix integer overflow 
Fixes CID703743
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 23:24:03 +02:00
Michael Niedermayer
ba39303050 gxfenc: fix null ptr dereference 
Fixes CID703677
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 23:21:41 +02:00
Michael Niedermayer
395caf3de8 hls: fix integer overflow 
Fixes CID717892
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 23:00:47 +02:00
Michael Niedermayer
a96577df38 avio: fix sizeof argument 
Fixes CID732284
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 22:35:32 +02:00
Hendrik Leppkes
d2d08d706b gitignore: ignore files created by msvc 
exp files are created in every build and contain export information
of the libraries. Both pdb and ilk are created during debug builds,
and contain linking and debug information used by MSVC.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-10-19 22:15:03 +02:00
Michael Niedermayer
d30351363f url_alloc_for_protocol: fix use of uninitialized variable 
Fixes CID703830
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 22:14:13 +02:00
Michael Niedermayer
3d48dd01fd avidec: remove unneeded null check 
Fixes CID29555
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 21:46:39 +02:00
Michael Niedermayer
aaf78e4d14 vf_mp: fix null ptr deref in case of ENOMEM 
Fixes CID703675
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 19:59:38 +02:00
Michael Niedermayer
042a738b45 vf_mp: check list in querry_format() 
Fixes CID717772
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 19:59:38 +02:00
Michael Niedermayer
31fdf3065d vf_idet: reorder operations to avoid division by 0 
Fixes CID733738
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 19:59:32 +02:00
Martin Storsjö
12549db653 fate: Add proper dependencies for the tests in video.mak 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-19 20:27:16 +03:00
Michael Niedermayer
0fa26bd470 utvideoenc: fix theoretical integer overflow 
The image sizes needed for this overflow to happen are currently not
supported in lavc, thus this should have no effect execpt making the
code more robust in light of future changes.

Fixes CID732245
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 18:57:57 +02:00
Michael Niedermayer
d86ef54476 avcodec_align_dimensions2: add missing breaks 
This should have just cosmetic effects

Fixes CID603265
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 18:50:09 +02:00
Ash Hughes
2470851f12 lavc: enable recursively using avcodec_open2/close. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 18:05:12 +02:00
Diego Biurrun
4b587848ce configure: Disable Snow decoder and encoder by default 
Snow has serious unfixed bugs and no real-world use.
 2012-10-19 17:10:10 +02:00
Diego Biurrun
8fb1e26405 lzo: Drop obsolete fast_memcpy reference 2012-10-19 17:04:41 +02:00
Diego Biurrun
c896aa984e build: Drop OBJS declaration for non-existing PCM_DVD encoder 2012-10-19 17:04:41 +02:00