virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
53,332 Commits 37 Branches 400 Tags 462 MiB
069ede2981
Commit Graph

53332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
069ede2981 jpeg2000dec: Check ncomponents and tile dimensions 
Fixes various problems

Code ported from j2kdec

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 21:44:34 +02:00
Michael Niedermayer
78c7bff04a avcodec/j2k: rename J2K_ constants to JPEG2000_ 
This should simplify merging the 2 decoders

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 21:44:34 +02:00
Michael Niedermayer
0ab0ed2b86 j2k: Rename structs to be more similar to jpeg2000dec 
This should simplify merging

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 21:44:34 +02:00
Michael Niedermayer
376e89e280 j2kdec: s/decode_packets/jpeg2000_decode_packets/ 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 21:44:34 +02:00
Stefano Sabatini
a8d98377b1 lavfi/geq: prefer symbolic constants 
Hopefully enhance readability.
 2013-05-21 21:15:08 +02:00
Stefano Sabatini
2210003b7f lavfi/geq: add aliases for RGB options 2013-05-21 21:15:00 +02:00
Paul B Mahol
dbb49a6539 vp3: zero allocated tables 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-21 17:49:29 +00:00
Michael Niedermayer
66f5790d7b seek-test: make duration user configurable 
Previously this was hardcoded to 4 seconds

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 18:13:25 +02:00
Clément Bœsch
b8a9876a8b lavfi/yadif: add timeline support. 2013-05-21 16:09:42 +02:00
Michael Niedermayer
b1bbd715d8 avcodec/huffman: increase bits constant 
Fixes Ticket2593

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 13:51:04 +02:00
Michael Niedermayer
b9ea6a8414 avcodec/huffman: use named identifer for the bits constant 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 13:51:04 +02:00
Michael Niedermayer
1d7e6a6bde avcodec/bitstream: print vlc length in error case. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 13:51:04 +02:00
Michael Niedermayer
b60a65ee2d mjpegdec: fix AV_PIX_FMT_YUVJ411P handling 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 12:56:12 +02:00
Michael Niedermayer
a90baa63c3 add YUVJ411P 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 12:56:11 +02:00
Michael Niedermayer
1d8b1f0e51 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  proresdec: simplify slice component offsets handling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 12:01:58 +02:00
Michael Niedermayer
6ef7b6af6b Merge commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8' 
* commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8':
  mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac

Conflicts:
	libavcodec/mjpegdec.c

See: 1f41cffe1e

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 12:01:37 +02:00
Michael Niedermayer
877cae6eff Merge commit 'c209d0df657f172f42d9bafbcdfa02dfb14f6965' 
* commit 'c209d0df657f172f42d9bafbcdfa02dfb14f6965':
  fate.sh: add support for build-only FATE instances

Conflicts:
	doc/fate.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 11:36:49 +02:00
Michael Niedermayer
3b071a4390 Merge commit 'a030279a67ef883df8cf3707774656fa1be81078' 
* commit 'a030279a67ef883df8cf3707774656fa1be81078':
  ljpeg: use the correct number of components in yuv

Conflicts:
	libavcodec/mjpegdec.c

See: b2e57eb5a3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 11:25:46 +02:00
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
Kostya Shishkov
03ece7b040 proresdec: simplify slice component offsets handling 2013-05-21 09:58:59 +02:00
Luca Barbato
cfbd98abe8 mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac 
Prevent out of buffer write when decoding broken samples.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-05-21 09:46:02 +02:00
Diego Biurrun
c209d0df65 fate.sh: add support for build-only FATE instances 
If the "build_only" variable is set in the configuration file, the
FATE client will skip running tests and just compile all targets.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-21 10:07:19 +03: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
a030279a67 ljpeg: use the correct number of components in yuv 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-05-20 22:02:05 +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