virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Code Issues Releases Activity
49,827 Commits 37 Branches 401 Tags
Commit Graph

49827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
3ccda2b02b Merge commit '375ef6528c9dd2db7f9881e232cb0ec3aa16970d' 
* commit '375ef6528c9dd2db7f9881e232cb0ec3aa16970d':
  libfdk-aacenc: Actually check for upper bounds of cutoff
  arm: Fall back to runtime cpu feature detection via /proc/cpuinfo

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 12:41:09 +01:00
Ronald S. Bultje
7ff1a4b10f Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil. 
These functions are mostly H264-specific (the only other user I can
spot is bink), and this allows us to special-case some functionality
for H264. Also remove the 16-bit-coeff with >8bpp versions (unused)
and merge the duplicate 32-bit-coeff for >8bpp (identical).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 02:14:16 +01:00
Michael Niedermayer
5260edee7e sanm: Use the correct height variable in the decoded_size checks 
Fixes integer overflow and out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 02:04:24 +01:00
Michael Niedermayer
4ee88db840 sanm: init sizes with the full frame size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 02:00:33 +01:00
Michael Niedermayer
f0d9ccac89 sanm: reset frame sizes on buffer destruction 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 01:59:07 +01:00
Michael Niedermayer
365270aec5 sanm: add forgotten check for decoded_size in old_codec37() 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 01:15:57 +01:00
Michael Niedermayer
3b1f037df5 ffmpeg: fix streamcopy of lsf mp3. 
Fixes streamcopy of bear_mpeg4_mp3.avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-12 00:38:22 +01:00
Stefano Sabatini
64353be811 doc/filters: rework idet filter description 2013-02-11 23:43:37 +01:00
Stefano Sabatini
af60e45150 doc/filters: apply minor fixes to il filter docs 2013-02-11 23:43:37 +01:00
Stefano Sabatini
4c69cafcee doc/filters: fix position of il filter docs 2013-02-11 23:43:37 +01:00
Ronald S. Bultje
b582af1ed7 Use simple nop codes for <= sse (rather than <= mmx). 
The "CPU: CentaurHauls family 6 model 9 stepping 8" family of CPUs
(flags: fpu vme de pse tsc msr cx8 sep mtrr pge mov pat mmx fxsr sse
up rng rng_en ace ace_en) SIGILLs on long nop codes.

Change-Id: I7e7c52a2191006df30a9aadbc40d481a1db89106
 2013-02-11 23:38:57 +01:00
Ronald S. Bultje
972771dcf2 h264chroma: remove duplicate 9/10 bit functions. 
Also use the resulting 16bpp functions for anything >8 and <=16, not just
9 and 10. This fixes 12 and 14bpp H264 support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-11 22:54:52 +01:00
Michael Niedermayer
0aa1d848ec ffv1enc: better heuristic to calculate initial states 
Slightly improves compression of 2pass files

Tested-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-11 19:25:41 +01:00
Derek Buitenhuis
c177f2ec4a libfdk-aacenc: Actually check for upper bounds of cutoff 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-02-11 10:20:33 -05:00
Derek Buitenhuis
375ef6528c libfdk-aacenc: Actually check for upper bounds of cutoff 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-02-11 10:15:42 -05:00
Martin Storsjö
ab8f1a6989 arm: Fall back to runtime cpu feature detection via /proc/cpuinfo 
On recent android versions, /proc/self/auxw is unreadable
(unless the process is running running under the shell uid or
in debuggable mode, which makes it hard to notice). See
http://b.android.com/43055 and
https://android-review.googlesource.com/51271 for more information
about the issue.

This makes sure e.g. neon optimizations are enabled at runtime in
android apps even when built in release mode, if configured to
use the runtime detection.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-02-11 17:15:15 +02:00
Paul B Mahol
8160864b00 lavfi/amerge: make description consistent with documentation 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-11 14:43:23 +00:00
Carl Eugen Hoyos
182e342fdb Print mxf Universal Label if the user requested verbose logging. 
Fixes ticket #2198
 2013-02-11 13:11:16 +01:00
Michael Niedermayer
c3a62d3507 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  sparc: dsputil_vis: Fix silly variable name search and replace typo

Conflicts:
	libavcodec/sparc/dsputil_vis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-11 12:15:54 +01:00
Paul B Mahol
5d7009dac2 evrcdec: fix wrong condition 
Fixes CID980005 and CID980004.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-11 11:04:52 +00:00
Ronald S. Bultje
fd6a021d8e get_bits: return pointer to buffer that is the result of the alignment. 
This allows more transparent mixing of get_bits and whole-byte access
without having to touch get_bits internals.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-11 02:29:43 +01:00
Ronald S. Bultje
5e74a2b685 bit_depth_template: don't depend on dsputil.h. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-11 01:03:45 +01:00
Ronald S. Bultje
c7e3e55429 Move ff_emulated_edge_mc prototypes to videodsp. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-11 01:03:33 +01:00
Ronald S. Bultje
55e35c98d5 h264 intra pred: add missing includes. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-11 01:03:12 +01:00
Michael Niedermayer
8491ac3ad2 mlpdec: check ch_assign more completely 
Fixes CID970924

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-11 00:50:29 +01:00
Diego Biurrun
d46d87d1d3 sparc: dsputil_vis: Fix silly variable name search and replace typo 2013-02-10 22:23:43 +01:00
Stefano Sabatini
3acaea26e5 lavfi/il: filter out hwaccels formats from the list of supported formats 2013-02-10 21:00:56 +01:00
Stefano Sabatini
6b171f046c lavf/matroskaenc: provide more feedback in case of unsupported codec 
Also return meaningful error code.
 2013-02-10 21:00:56 +01:00
Stefano Sabatini
f0703b6cba lavd/v4l2: fix error logic when enumerating standards 
Set ret to 0 before enumerating standards in v4l2_set_parameters(), avoid
use of uninitialized variable.

Regression introduced in 60950adc18fe145a235211e75da68ab07123fcaa.
 2013-02-10 20:59:06 +01:00
Michael Niedermayer
0e3dacb11e tiff: dont leave geotag_count in an invalid state on errors. 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 20:24:53 +01:00
Michael Niedermayer
f28043d0a3 tiff: check for failure in search_keyval() 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 20:18:16 +01:00
Michael Niedermayer
478fc7f57b pictordec: fix cga palette index limit 
Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 18:31:05 +01:00
Michael Niedermayer
ea1d8465e6 Fix division by 0 due to audio frame size 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 18:15:33 +01:00
Michael Niedermayer
cb85779d45 dpx: include offset in the total_size calculation 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 17:54:00 +01:00
Michael Niedermayer
151067bbc2 dpx: Fix rounding in 10bit total_size calculation 
This could have caused out of array reads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 17:52:24 +01:00
Michael Niedermayer
d24de4596c pcx: Add missing padding to scanline buffer 
Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 17:32:05 +01:00
Michael Niedermayer
f41329c8ae pcx: use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 17:32:05 +01:00
Stefano Sabatini
60950adc18 lavd/v4l2: implement consistent error handling 
In particular, avoid use of non-thread-safe strerror(), and store errno
before calling av_log().
 2013-02-10 17:09:57 +01:00
Stefano Sabatini
e005697af6 tests: add fate-lavfi-il test 2013-02-10 17:09:57 +01:00
Michael Niedermayer
6462268e74 pcx: fix rounding in bytes_per_scanline check 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 16:52:38 +01:00
Carl Eugen Hoyos
034a125c8c Support more atrac3-in-mkv samples. 
The mkv demuxer sometimes finds 12 bytes of realmedia
extradata after the matroska real audio properties.
 2013-02-10 14:44:00 +01:00
Michael Niedermayer
2c5e4ae291 Revert "Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'" 
This reverts commit d80820655362645ae1c65d457287d7d12c04a44f, reversing
changes made to 30085bd43e35acf931429dc445db5bc1869be022.

This is not needed

Requested-by: Marton Balint
 2013-02-10 14:27:57 +01:00
Michael Niedermayer
02b3ac87f8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  sws: disable yuv2rgb warning for planar rgb.

Conflicts:
	libswscale/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 14:17:06 +01:00
Michael Niedermayer
f2b89f21cc Merge commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551' 
* commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551':
  sws: dont enable chrSrcHSubSample for planar RGB

Conflicts:
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 14:07:27 +01:00
Stefano Sabatini
0b18965434 lavfi/il: move query_formats() definition up 
Respect order of call during the filter lifecycle, improve readability.
 2013-02-10 14:00:19 +01:00
Stefano Sabatini
63a9962287 lavfi/il: simplify/generalize linesize computation 
Rely on generic utilities for computing each plane linesize.

In particular, add support to NV12/21 formats and avoid use of
PIX_FMT_PLANAR pixdesc flag, whose semantics is questionable.

It also fixes various crashes.
 2013-02-10 14:00:19 +01:00
Michael Niedermayer
d1d9b93e9a Merge commit 'e58013dd8f00e17dd98ba64e41c72f1d152f6608' 
* commit 'e58013dd8f00e17dd98ba64e41c72f1d152f6608':
  sws: use planarRgbToRgbWrapper only for 8bit per component

Conflicts:
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 13:55:51 +01:00
Michael Niedermayer
42431a557e Merge commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821' 
* commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821':
  sws: GBRP9, GBRP10, and GBRP16 output support

Conflicts:
	libswscale/output.c
	libswscale/utils.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 13:49:53 +01:00
Michael Niedermayer
e88f392733 Merge commit '81726a4f0b8a43e19898e2a36fdde80583bafff0' 
* commit '81726a4f0b8a43e19898e2a36fdde80583bafff0':
  FATE: add tests for additional flavors of asf cover art
  asfdec: do not assume every AVStream has a corresponding ASFStream

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 13:18:04 +01:00
Michael Niedermayer
9a714d871a Merge commit 'f5fac6f77752931347ab302563802dcaa49c2419' 
* commit 'f5fac6f77752931347ab302563802dcaa49c2419':
  asfdec: support reading ID3v2 tags in ASF files

Conflicts:
	Changelog
	libavformat/asfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-10 13:06:16 +01:00