virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
53,442 Commits 37 Branches 400 Tags 460 MiB
efcc334c9d
Commit Graph

53442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
4390fa6273 Merge commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d' 
* commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d':
  Remove commented-out #includes
  h263dec: Remove broken and disabled debug cruft
  vc1: Reindent INIT_LUT(), align backslashes

Conflicts:
	libavcodec/vc1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-16 09:11:04 +02:00
Anton Khirnov
3062ac4c47 vf_pad: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:36:10 +02:00
Anton Khirnov
a70519aad1 vf_overlay: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:36:04 +02:00
Anton Khirnov
8d2565c28b vf_lut: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:35:59 +02:00
Anton Khirnov
4753f802c0 vf_libopencv: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:35:53 +02:00
Anton Khirnov
56e4ce0d13 vf_hqdn3d: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:35:48 +02:00
Anton Khirnov
7af5ae2d07 vf_hflip: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:33:38 +02:00
Anton Khirnov
05fab5530b vf_gradfun: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:33:29 +02:00
Anton Khirnov
f6b6d6ac42 vf_frei0r: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:33:23 +02:00
Anton Khirnov
cbec213a90 vf_format: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:33:17 +02:00
Anton Khirnov
d64cf54b34 vf_fieldorder: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:33:07 +02:00
Anton Khirnov
9bbf6c681a vf_fieldorder: cosmetics, remove an extra linebreak 2013-05-16 07:32:49 +02:00
Anton Khirnov
c0279956b3 vf_fade: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:32:43 +02:00
Anton Khirnov
d3735f7ad6 vf_drawtext: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:32:34 +02:00
Anton Khirnov
20e2794eea vf_drawbox: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:32:27 +02:00
Anton Khirnov
ba09675f44 vf_delogo: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:31:57 +02:00
Anton Khirnov
e16e23d70e vf_cropdetect: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:31:50 +02:00
Anton Khirnov
671563d9fd vf_crop: cosmetics, break lines 2013-05-16 07:31:31 +02:00
Anton Khirnov
7f83959598 vf_crop: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:31:11 +02:00
Anton Khirnov
762df56ef9 vf_boxblur: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:30:56 +02:00
Anton Khirnov
a2a696990c vf_blackframe: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:30:41 +02:00
Anton Khirnov
b3ea76624a vf_aspect: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:30:28 +02:00
Clément Bœsch
d686517ad1 lavfi/mp: remove mp=ow wrapper. 
Filter ported natively as owdenoise.
 2013-05-16 00:45:45 +02:00
Clément Bœsch
b1e84efa3d lavfi: port wavelet denoiser filter from libmpcodecs. 2013-05-16 00:45:45 +02:00
Diego Biurrun
2832ea26f3 Remove commented-out debug #define cruft 2013-05-16 00:23:30 +02:00
Luca Barbato
ff4fc5ef12 jpegls: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-05-16 00:00:41 +02:00
Diego Biurrun
9cacdabd1c jpegls: cosmetics: Drop some unnecessary parentheses 2013-05-15 23:58:04 +02:00
Diego Biurrun
004b81c465 mpegvideo: Remove commented-out PARANOID debug cruft 2013-05-15 23:53:42 +02:00
James Almer
35188e91ef lavu/hash: Fix CRC32 calculation 
Initialize it with UINT32_MAX and xor the result with UINT32_MAX
as well.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 23:53:40 +02:00
James Almer
c55c715c81 lavu/hash: Fix adler32 calculation 
Adler must be initialized with a non zero value.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 23:53:40 +02:00
Diego Biurrun
d46c588f3c Remove commented-out #includes 2013-05-15 23:01:21 +02:00
Diego Biurrun
bfd00cc4c2 h263dec: Remove broken and disabled debug cruft 2013-05-15 23:01:21 +02:00
Michael Niedermayer
42af97dbc0 Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavf/concat: reject empty scripts.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 20:22:31 +02:00
Michael Niedermayer
e3c24f663e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: Use linker hardening flags on mingw
  vc1: Make INIT_LUT() self contained
  vc1: Simplify code by using INIT_LUT()
  vc1: Move INIT_LUT() further up to allow using it in more places
  vc1dec: Remove some now unused variables
  vc1dec: Do not allow field_mode to change after the first header
  vc1, mss2: Check for any negative return value from ff_vc1_parse_frame_header
  vc1dec: Fix current ptr selection in vc1_mc_4mv_chroma()
  vc1dec: Factorize picture pointer selection in vc1_mc_4mv_chroma()
  vc1dec: Factorize picture pointer selection code
  vc1dec: Factorize srcU/V offseting
  vc1dec: Fix tff == 0 handling in init_block_index()
  vc1dec: Update destination pointers in context for fields

Conflicts:
	libavcodec/vc1.c
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 20:09:20 +02:00
Martin Storsjö
b0696e947f vc1: Reindent INIT_LUT(), align backslashes 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 20:59:24 +03:00
Nicolas George
ca2f6b6932 lavf/concat: reject empty scripts. 
Fix trac ticket #2566.
 2013-05-15 16:53:35 +02:00
Paul B Mahol
c45b823bf8 lavfi/histogram: logarithmic mode for levels 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-15 12:38:39 +00:00
Alex Smith
225a5f91cc configure: Use linker hardening flags on mingw 
This makes it consistent with the msvc builds which automatically set
the DEP and ASLR flags by default.  There really is no good reason why
they shouldn't be set.

The fact that binutils does not set them on by default boggles the mind.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 14:42:08 +03:00
Paul B Mahol
fa23f94eac wv: make probing more robust 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-15 10:51:30 +00:00
Michael Niedermayer
a9cadacdd9 dpxenc: dont shift into the sign bit. 
Fixes IOC warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 12:15:21 +02:00
Michael Niedermayer
e003413fe9 murmur3: fix memleak 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 12:10:09 +02:00
Michael Niedermayer
6ce2c3106d vc1: Make INIT_LUT() self contained 
Move the local variables it uses into the macro, enclosing them
in a do {} while (0) scope.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 12:42:53 +03:00
Michael Niedermayer
3ac3edf63b Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Reduce probing score for flic animation files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 11:37:58 +02:00
Michael Niedermayer
c7c71f95f8 replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_* 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 11:23:14 +02:00
Carl Eugen Hoyos
86ea021b3a Reduce probing score for flic animation files. 
Fixes ticket #2567.
 2013-05-15 11:20:39 +02:00
Michael Niedermayer
37f2ac36a9 vc1: Simplify code by using INIT_LUT() 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 12:13:53 +03:00
Michael Niedermayer
0379fc1487 vc1: Move INIT_LUT() further up to allow using it in more places 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 12:13:53 +03:00
Martin Storsjö
3ca3709ad4 vc1dec: Remove some now unused variables 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 12:13:53 +03:00
Michael Niedermayer
4162fc62b3 vc1dec: Do not allow field_mode to change after the first header 
This fixes out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 12:13:53 +03:00
Martin Storsjö
ec7d002e55 vc1, mss2: Check for any negative return value from ff_vc1_parse_frame_header 
This is required if we return other error codes than explicitly
-1, which so far has been the only other possible return value
besides 0.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 12:13:53 +03:00