RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-10 17:19:29 +00:00
Code Issues Projects Releases Wiki Activity
53,310 Commits 37 Branches 400 Tags 253 MiB
f57a7ac9b8
Commit Graph

53310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
f57a7ac9b8 Merge commit '8aa3500905fec6c4e657bb291b861d43c34d3de9' 
* commit '8aa3500905fec6c4e657bb291b861d43c34d3de9':
  mjpeg: Validate sampling factors

Conflicts:
	libavcodec/mjpegdec.c

See: 08c37a10e9

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 10:50:03 +02:00
Xidorn Quan
5a65fea655 avutil/frame: continue to process bufs even if some are empty 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-20 23:34:15 +02:00
Giorgio Vazzana
a67304d05f avutil/md5: move loop inside inner function 
AMD Athlon(tm) II X3 450 Processor

size: 1048576  runs: 1024  time:    5.660 +- 0.023
size: 1048576  runs: 1024  time:    5.661 +- 0.030
size: 1048576  runs: 1024  time:    5.656 +- 0.022
size: 1048576  runs: 1024  time:    5.647 +- 0.026

size: 1048576  runs: 1024  time:    5.428 +- 0.037
size: 1048576  runs: 1024  time:    5.426 +- 0.034
size: 1048576  runs: 1024  time:    5.426 +- 0.034
size: 1048576  runs: 1024  time:    5.428 +- 0.038

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-20 22:07:48 +02:00
Luca Barbato
8aa3500905 mjpeg: Validate sampling factors 
They must be non-zero.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-05-20 22:02:05 +02:00
Michael Niedermayer
2211c76287 smacker: remove av_clip_int16() 
Fixes Ticket2425

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-20 21:45:40 +02:00
Michael Niedermayer
2187600f47 libx264: silence: warning: the address of val will always evaluate as true 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-20 16:39:00 +02:00
Clément Bœsch
9a7f1519aa lavd/v4l2enc: check write return value. 2013-05-20 16:33:21 +02:00
Michael Niedermayer
f099cdaba3 avcodec/ratecontrol: silence "warning: expected_bits may be used uninitialized in this function" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-20 15:49:49 +02:00
Michael Niedermayer
9c49d5908d avutil/hmac: silence pointer type warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-20 14:48:55 +02:00
Michael Niedermayer
d61681f9e9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegvideo: unref old current_picture before allocating a new one

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-20 12:07:17 +02:00
Michael Niedermayer
c5e11e897a Merge commit 'db347280eb3746d7b70888db97f1efe5f06f5624' 
* commit 'db347280eb3746d7b70888db97f1efe5f06f5624':
  vorbis: fallback to normal division instead of crashing

Conflicts:
	libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-20 12:02:18 +02:00
Michael Niedermayer
ed113d7a6b Merge commit 'ddf1b4a2f8a680126eb611428e4f47e6e5b8c6c0' 
* commit 'ddf1b4a2f8a680126eb611428e4f47e6e5b8c6c0':
  vorbis: simplify the inner loop in setup_classifs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-20 11:42:03 +02:00
Michael Niedermayer
aef044d215 Merge commit '36f10380043c8b8c5cbf8c1add8695089cdaa341' 
* commit '36f10380043c8b8c5cbf8c1add8695089cdaa341':
  vorbis: use normal integer values for iterators

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-20 11:28:21 +02:00
Stefano Sabatini
6e7c534955 doc/filters: add RGB geq example 2013-05-20 11:12:09 +02:00
Stefano Sabatini
281fc4e958 doc/filters: extend/fix documentation for the geq filter 2013-05-20 11:12:04 +02:00
Michael Niedermayer
fbba76e89d Merge commit '98186578a2a21af5bfe6dd71d222dc270f763c7d' 
* commit '98186578a2a21af5bfe6dd71d222dc270f763c7d':
  vorbis: refactor vorbis_residue_decode_internal

Conflicts:
	libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-20 10:58:43 +02:00
Michael Niedermayer
faac955d9b Merge commit 'c360fb174b01170ab3fd3048d4d0acb44aa4e834' 
* commit 'c360fb174b01170ab3fd3048d4d0acb44aa4e834':
  win32: Do not use GetProcAddress when compiled for Vista+

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-20 10:52:19 +02:00
Michael Niedermayer
2afcd16711 Merge commit '0b6899f154347cdd0aa66c5ec16ed9c65871766f' 
* commit '0b6899f154347cdd0aa66c5ec16ed9c65871766f':
  configure: msvc: Set the target windows version to XP if no target is set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-20 10:46:21 +02:00
Giorgio Vazzana
d0a34aeedf md5: optimize second round by using 4-operation form of G() 
4-operation form is preferred over 3-operation because it breaks a long
dependency chain, thus allowing a superscalar processor to execute more
operations in parallel.
The idea was taken from: http://www.zorinaq.com/papers/md5-amd64.html

AMD Athlon(tm) II X3 450 Processor, x86_64

$ for i in $(seq 1 4); do ./avutil_md5_test2; done
size: 1048576  runs: 1024  time:    5.821 +- 0.019
size: 1048576  runs: 1024  time:    5.822 +- 0.019
size: 1048576  runs: 1024  time:    5.841 +- 0.018
size: 1048576  runs: 1024  time:    5.821 +- 0.018

$ for i in $(seq 1 4); do ./avutil_md5_test2; done
size: 1048576  runs: 1024  time:    5.646 +- 0.019
size: 1048576  runs: 1024  time:    5.646 +- 0.018
size: 1048576  runs: 1024  time:    5.642 +- 0.019
size: 1048576  runs: 1024  time:    5.641 +- 0.019

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-20 04:27:34 +02:00
Stefano Sabatini
b7be8ea92a lavfi/geq: mark timeline support 2013-05-20 01:40:07 +02:00
Clément Bœsch
16a75eaa20 lavd: add v4l2 outdev. 2013-05-20 01:11:33 +02:00
Clément Bœsch
8eec655320 lavd/v4l2: move pixel format conversion code to a separate place. 
This will be shared with the output device.
 2013-05-20 01:11:28 +02:00
Michael Niedermayer
729fa55b8f avformat/matroskadec: fix integer overflow 
Fixes fate-mkv with ekopath 4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-19 23:38:01 +02:00
Janne Grunau
4b79668154 mpegvideo: unref old current_picture before allocating a new one 
Allows decoding with only three frame buffers with frame reference
counting. Fixes VAAPI based decoding in vlc which uses only three
frame buffers for the mpegvideo-based codecs.
 2013-05-19 23:02:35 +02:00
Luca Barbato
db347280eb vorbis: fallback to normal division instead of crashing 
The use of ff_inverse speeds up slightly arches + compilers that
do not provide a division faster than the whole machinery, such
as ppc32 + gcc4.7, but has operational limits.

Drop the always-enable assert and provide a fallback.
 2013-05-19 22:56:37 +02:00
Luca Barbato
ddf1b4a2f8 vorbis: simplify the inner loop in setup_classifs 2013-05-19 22:56:37 +02:00
Luca Barbato
36f1038004 vorbis: use normal integer values for iterators 
No need to use fixed-size integers.
 2013-05-19 22:56:37 +02:00
Luca Barbato
98186578a2 vorbis: refactor vorbis_residue_decode_internal 2013-05-19 22:56:37 +02:00
Michael Niedermayer
1a5f1bcff0 configure: add more allocation functions to valgrind-massif 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-19 20:30:51 +02:00
Stefano Sabatini
427b51269e cmdutils: show timeline support in -filters listing 2013-05-19 19:55:15 +02:00
Stefano Sabatini
66f32a8a7f lavfi/drawgrid: fix drawgrid options after 4c205f42c8 2013-05-19 19:26:31 +02:00
Stefano Sabatini
be3f4c13b6 doc/Makefile: install .3 man pages to man3 subdir 
Fix trac ticket #2585.
 2013-05-19 19:26:25 +02:00
Stefano Sabatini
90cb081f88 build: drop unused ALLMANPAGES variable 2013-05-19 19:26:21 +02:00
Michael Niedermayer
73b9f31c74 mjpeg_decode_com: remove redundant len checks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-19 18:09:57 +02:00
Piotr Bandurski
2f75dcdc1c mjpegdec: Fix field orderforinterlacedAVDJand AVRN in ntsc mode 
Fixes ticket1656

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-19 18:09:57 +02:00
Clément Bœsch
56f7e29dba tools: add zmqshell.py. 2013-05-19 17:59:21 +02:00
Jean-Baptiste Kempf
c360fb174b win32: Do not use GetProcAddress when compiled for Vista+ 
Instead link directly to the condition variable functions.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-19 18:22:39 +03:00
Martin Storsjö
0b6899f154 configure: msvc: Set the target windows version to XP if no target is set 
MSVC 2010 (or more precisely, Windows SDK 7.0 which comes with MSVC
2010) sets _WIN32_WINNT to the constant for Windows 7 if nothing is
set. This could lead to the libav configure script detecting and
using functions only present in Windows 7 or newer, which in most
cases isn't desired. If the caller explicitly wants this, the caller
can add the _WIN32_WINNT define via --extra-cflags, setting the desired
version.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-19 18:22:32 +03:00
Paul B Mahol
68c4633fa8 lavfi/histogram: cache log2 of max_hval 
Instead of calculating same value over and over again.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-19 14:30:42 +00:00
Paul B Mahol
b154d203b1 swscale/output: silence warning about undefined 'ASSERT_LEVEL' 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-19 14:06:16 +00:00
Paul B Mahol
f4b2d3598b swscale/output: remove unused header 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-19 14:04:14 +00:00
Michael Niedermayer
a3264b4ba1 ffv1dec: defuse membomb 
Fixes Ticket2589

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-19 13:56:13 +02:00
Michael Niedermayer
1de28cb7e4 configure: use the user specified valgrind excutable for massif 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-19 11:24:15 +02:00
Michael Niedermayer
f51263e6fe configure: fix valgrind-massif to actually work 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-19 11:23:28 +02:00
Michael Niedermayer
73920ac573 ffserver: replace atoll() by strtoll() 
this should make it easier to support ffserver with msvc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-19 11:13:07 +02:00
Michael Niedermayer
0a8e86faf2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Escape 130 FATE test

Conflicts:
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-19 11:06:39 +02:00
Michael Niedermayer
fa6001e728 Merge commit '8e673efc6f5b7a095557664660305148f2788d30' 
* commit '8e673efc6f5b7a095557664660305148f2788d30':
  prores: update FATE test to account for alpha plane present in the test sample
  configure: Add basic valgrind-massif support

Conflicts:
	tests/fate/prores.mak
	tests/ref/fate/prores-alpha

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-19 10:53:39 +02:00
Michael Niedermayer
3e3514bce2 Merge commit 'ed50673066956d6f2201a57c3254569f2ab08d9d' 
* commit 'ed50673066956d6f2201a57c3254569f2ab08d9d':
  wavpack: validate samples size parsed in wavpack_decode_block

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-19 10:38:08 +02:00
Michael Niedermayer
2ad415cfa4 Merge commit '8c34558131d846d2b10389564caadaa206372fd4' 
* commit '8c34558131d846d2b10389564caadaa206372fd4':
  wavpack: return meaningful errors

Conflicts:
	libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-19 10:22:05 +02:00
Michael Niedermayer
02788d2ac5 Merge commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e' 
* commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e':
  wavpack: K&R formatting cosmetics

Conflicts:
	libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-19 10:10:00 +02:00