generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
39,129 Commits 24 Branches 241 Tags 173 MiB
740b9ff44e
Commit Graph

39129 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
1bc85fb32d dirac: mark some variables const. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-15 22:12:02 +01:00
Michael Niedermayer
ae76c1af16 4xm: make mcdc() src const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-15 22:07:54 +01:00
Justin Ruggles
90e5b58a53 FATE: add capability for audio encode/decode tests with fuzzy psnr comparison 
This allows for testing floating-point audio encoders across different
platforms where exact comparisons are unreliable due to float rounding
differences.
 2012-03-15 17:06:17 -04:00
Michael Niedermayer
bf3a404572 mpegvideo: fix constness error in ff_MPV_encode_picture() 
The struct has some of its fields changed, thus is not strictly const.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-15 22:05:30 +01:00
Michael Niedermayer
add40b7b6a tests/rotozoom: make some things const. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-15 21:52:11 +01:00
Justin Ruggles
cffd7580bb FATE: allow a tolerance in the size comparison in do_tiny_psnr() 
This will allow for comparing decoded output to the original source when the
decoded size is not exactly the same as the original size.
 2012-03-15 14:40:31 -04:00
Justin Ruggles
bb6842966e FATE: use absolute difference from a target value in do_tiny_psnr() 
This will allow comparison to original pre-encoded content instead of
comparing to expected decoded output.
 2012-03-15 14:40:31 -04:00
Justin Ruggles
5ecadc6620 FATE: allow tests to set CMP_SHIFT to pass to tiny_psnr 
This will allow adjusting for any encoder or decoder delay when doing
comparisons.
 2012-03-15 14:40:24 -04:00
Justin Ruggles
0720d263ea FATE: use $fuzz directly in do_tiny_psnr() instead of passing it around 2012-03-15 12:06:56 -04:00
Paul B Mahol
702985b8b7 dxa: remove useless code 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-03-15 14:01:23 +01:00
Anton Khirnov
cd9a3c3512 lavf: don't select an attached picture as default stream for seeking. 2012-03-15 14:01:05 +01:00
Anton Khirnov
251422982b avconv: remove pointless checks. 
OutputStream.picref is guaranteed to be non-NULL if
get_filtered_video_frame() succeeds.
 2012-03-15 09:01:18 +01:00
Anton Khirnov
ce326c1130 avconv: check for get_filtered_frame() failure. 2012-03-15 09:00:55 +01:00
Anton Khirnov
2636e691ce avconv: remove a pointless check. 
output_video_filter is always guaranteed to be set and is in fact
dereferenced right above the check.
 2012-03-15 09:00:49 +01:00
Michael Niedermayer
a04a97bc88 Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: force video refresh if the window is resized or damaged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-15 08:26:47 +01:00
Ronald S. Bultje
45fdcc8e2d swscale: convert hscale() to use named arguments. 2012-03-14 20:09:53 -07:00
Ronald S. Bultje
98b9da2ac7 x86inc: add *mp named argument support to DEFINE_ARGS. 2012-03-14 20:09:53 -07:00
Ronald S. Bultje
aba7a827aa swscale: convert hscale to cpuflags(). 2012-03-14 20:09:53 -07:00
Michael Niedermayer
67235dfa1d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: stricter reference limit enforcement.
  h264: increase reference poc list from 16 to 32.
  xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns.
  snow: check reference frame indices.
  snow: reject unsupported chroma shifts.
  Add ffvhuff encoding and decoding regression test
  anm: convert to bytestream2 API
  bytestream: add more unchecked variants for bytestream2 API
  jvdec: unbreak video decoding
  jv demux: set video stream duration
  fate: add pam image regression test

Conflicts:
	libavcodec/adpcm.c
	libavcodec/anm.c
	libavcodec/h264.c
	libavcodec/mpegvideo.h
	libavcodec/snowdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-15 01:27:10 +01:00
Marton Balint
dbe7170e2a ffplay: force video refresh if the window is resized or damaged 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2012-03-15 00:58:13 +01:00
Michael Niedermayer
9e2ee46206 vf_fspp: add ff_ prefix to non static variables. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-14 23:06:00 +01:00
Michael Niedermayer
3bd749f335 docs: Add examples for -cpuflags 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-14 23:06:00 +01:00
Michael Niedermayer
f43a16049e cmdutils: Fix cpuflags so the flags dont pull in and out other flags. 
Note, this doesnt break compatibility with libav, as libav
has implemented a incompatible and more limited system under the same
-cpuflags command line option we used since some time.

The differences to libav for example are we can do things like
ffmpeg -cpuflags -sse+mmx -cpuflags +3dnow
Its also possible in our system to force flags that have not been
detected as available
And our -cpuflags works with all tools not just 1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-14 23:05:38 +01:00
Baptiste Coudurier
fa35ade8f9 vf_fspp: fix compilation with llvm 2012-03-14 22:35:15 +01:00
Aaron Colwell
bda5b6627a matroskaenc: change cluster_pos to use -1 as the "I'm not currently working on a cluster" signal instead of 0. 
This avoids problems
where avio_tell() returns 0. I've updated all the checks against
cluster_pos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-14 21:51:38 +01:00
Ronald S. Bultje
e0febda22d h264: stricter reference limit enforcement. 
Progressive images can have only 16 references, error out if there are
more, since the data is almost certainly corrupt, and the invalid value
will lead to random crashes or invalid writes later on.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-14 13:24:49 -07:00
Ronald S. Bultje
48cbe4b092 h264: increase reference poc list from 16 to 32. 
Interlaced images can have 32 references (16 per field), so limiting the
array size to 16 leads to invalid writes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-14 13:24:45 -07:00
Ronald S. Bultje
86020073db xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-14 13:24:40 -07:00
Michael Niedermayer
1f8ff2b13c snow: check reference frame indices. 
Fixes NULL ptr dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-14 13:24:35 -07:00
Michael Niedermayer
c9837954e7 snow: reject unsupported chroma shifts. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-14 13:24:31 -07:00
Paul B Mahol
92a02d935b Add ffvhuff encoding and decoding regression test 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-14 13:24:17 -07:00
Paul B Mahol
5b4d026a03 anm: convert to bytestream2 API 
Protects from overreads.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-14 13:23:07 -07:00
Paul B Mahol
f1ce053cd0 bytestream: add more unchecked variants for bytestream2 API 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-14 13:23:07 -07:00
Paul B Mahol
a1c036e961 jvdec: unbreak video decoding 
The safe bitstream reader broke it since the buffer size was specified
in bytes instead of bits.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
CC: libav-stable@libav.org
 2012-03-14 15:34:50 +01:00
Paul B Mahol
d3d1b25e69 jv demux: set video stream duration 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2012-03-14 15:34:50 +01:00
Paul B Mahol
05e0061ef6 fate: add pam image regression test 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2012-03-14 15:34:50 +01:00
Michael Niedermayer
7230116000 ffmpeg: Fix planar audio input. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-14 08:03:29 +01:00
Michael Niedermayer
6968a7d193 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc/general: update supported devices table.
  doc/general: add missing @tab to codecs table.
  h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction.
  avconv: reindent
  avconv: link '-passlogfile' option to libx264 'stats' AVOption.
  libx264: add 'stats' private option for setting 2pass stats filename.
  libx264: fix help text for slice-max-size option.
  http: Clear the auth state on redirects
  http: Retry auth if it failed due to being stale
  rtsp: Resend new keepalive commands if they used stale auth
  rtsp: Retry authentication if failed due to being stale
  httpauth: Parse the stale field in digest auth
  dxva2_vc1: pass the overlap flag to the decoder
  dxva2_vc1: fix decoding of BI frames
  FATE: add shorthand to wavpack test
  dfa: convert to bytestream2 API
  anm decoder: move buffer allocation from decode_init() to decode_frame()
  h264: improve parsing of broken AVC SPS

Conflicts:
	ffmpeg.c
	libavcodec/anm.c
	libavcodec/dfa.c
	libavcodec/h264.c
	libavcodec/h264_direct.c
	libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-14 02:10:11 +01:00
Michael Niedermayer
c2e3b564b3 mmvideo: restore initial y value. 
This bug might have been exploitable (out of HEAP buffer writes)

Bug introduced by libav
	commit a55d5bdc6e
	Date:   Tue Mar 6 15:15:42 2012 -0800

	    algmm: convert to bytestream2 API.
 2012-03-13 22:38:45 +01:00
Michael Niedermayer
67c90d2605 mmvideo: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-13 22:15:42 +01:00
Michael Niedermayer
bf521d5a5b jpeglsdec: suppress unused var warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-13 22:13:13 +01:00
Michael Niedermayer
0fdb4dfd03 h264: Fix some mixed declarations and code. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-13 22:10:02 +01:00
Michael Niedermayer
c592679cca eatgq: remove unused ret variable. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-13 22:05:22 +01:00
Michael Niedermayer
d9399c4b66 eamad: Remove redundant initialization of mv_map. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-13 22:04:25 +01:00
Anton Khirnov
972880f597 doc/general: update supported devices table. 
Add libcdio and fbdev, remove v4l1.
 2012-03-13 22:01:51 +01:00
Anton Khirnov
29e4046e83 doc/general: add missing @tab to codecs table. 2012-03-13 22:01:51 +01:00
Michael Niedermayer
9ff43569d2 g729dec: fix scalarproduct_int16 after API change 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-13 21:20:07 +01:00
Michael Niedermayer
758ec11153 h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-13 10:04:23 -07:00
Anton Khirnov
64334ddbbc avconv: reindent 
CC: libav-stable@libav.org
 2012-03-13 12:21:44 +01:00
Anton Khirnov
6e8be949f1 avconv: link '-passlogfile' option to libx264 'stats' AVOption. 
Fixes bug 204.

CC: libav-stable@libav.org
 2012-03-13 12:21:14 +01:00