wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
63894 commits 40 branches 405 tags 230 MiB
Commit graph

63894 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Niedermayer
c69defd4d0 avcodec/qtrleenc: Check that width is a multiple of 4 for grayscale 
grayscale is coded as 4 pixels at a time, the encoder lacks support
for the case where width%4 != 0, and will simply encode less data
leaving random data after decoding at the right side

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-11 04:02:53 +02:00
Michael Niedermayer
43d995e865 fate: Disable qtrlegray 34x34 test 
The encoder lacks support for width % 4 != 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-11 04:01:49 +02:00
Michael Niedermayer
b2fb65cbeb Merge commit '641e57230b' 
* commit '641e57230b':
  fate: add on2avc audio test

Conflicts:
	tests/fate/audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-11 03:10:21 +02:00
Michael Niedermayer
b3a647d9ce Merge commit 'd7705be961' 
* commit 'd7705be961':
  mpegvideoenc: check color_range

Conflicts:
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-11 02:57:08 +02:00
Michael Niedermayer
1290143fda Merge commit '27860819d5' 
* commit '27860819d5':
  ppc: Consistently use convenience macro for runtime CPU detection

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-11 02:50:50 +02:00
Michael Niedermayer
26be0e31fc Merge commit '205fdd4ea5' 
* commit '205fdd4ea5':
  ppc: Fix runtime CPU detection for apedsp, huffyuvdsp, svq1enc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-11 02:22:53 +02:00
Vittorio Giovara
641e57230b fate: add on2avc audio test 2014-06-10 19:41:59 -04:00
Vittorio Giovara
d7705be961 mpegvideoenc: check color_range 
Rework the comparison into something simpler to understand.
 2014-06-10 19:41:59 -04:00
Diego Biurrun
27860819d5 ppc: Consistently use convenience macro for runtime CPU detection 2014-06-10 15:13:57 -07:00
Diego Biurrun
205fdd4ea5 ppc: Fix runtime CPU detection for apedsp, huffyuvdsp, svq1enc 2014-06-10 15:13:57 -07:00
Michael Niedermayer
aff0912da5 Merge commit 'f121dbd9f7' 
* commit 'f121dbd9f7':
  mpegts: Provide an option to override the pcr period

Conflicts:
	doc/muxers.texi
	libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-10 23:55:57 +02:00
Carl Eugen Hoyos
723adfb1df Fix standalone compilation of the webvtt encoder. 2014-06-10 23:47:04 +02:00
Michael Niedermayer
2d99b4041f Merge commit '3f7e94eccd' 
* commit '3f7e94eccd':
  mpegts: Move the option section to the bottom

Conflicts:
	libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-10 23:27:16 +02:00
Michael Niedermayer
ac26d7ea9d Merge commit 'a736ae1e96' 
* commit 'a736ae1e96':
  doc: Document mpegts muxrate

Conflicts:
	doc/muxers.texi

See: 5b76c3a120
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-10 23:25:46 +02:00
Luca Barbato
f121dbd9f7 mpegts: Provide an option to override the pcr period 
Certain hardware demuxer have specific restrictions for PCR periodicity.
 2014-06-10 22:05:44 +02:00
Luca Barbato
3f7e94eccd mpegts: Move the option section to the bottom 
Makes it consistent with the rest of the formats and ease usage
of macros constants for the defaults.
 2014-06-10 22:05:44 +02:00
Luca Barbato
a736ae1e96 doc: Document mpegts muxrate 2014-06-10 22:05:44 +02:00
Christophe Gisquet
8d02a55b1b tests: add a third, 34x34, target 
This should exercise the corner cases of numerous codecs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-10 20:24:49 +02:00
Michael Niedermayer
1a2ff62859 Merge commit '570d4b2186' 
* commit '570d4b2186':
  x86: h264: Don't keep data in the redzone across function calls on 64 bit unix

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-10 18:35:49 +02:00
Michael Niedermayer
a2faa3d858 Merge commit '0776e0ef6b' 
* commit '0776e0ef6b':
  adpcm: Write the proper predictor in trellis mode in IMA QT

See: fa8f060b75
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-10 18:28:53 +02:00
Michael Niedermayer
fbc133915b Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Allow values >31bit for -analyzeduration.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-10 18:22:41 +02:00
Michael Niedermayer
3a76d7f73d avformat/nutenc: cleaner version check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-10 16:36:41 +02:00
Michael Niedermayer
d7f398c542 avformat/nutenc: Fix error handling in nut_write_packet() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-10 15:41:33 +02:00
Martin Storsjö
570d4b2186 x86: h264: Don't keep data in the redzone across function calls on 64 bit unix 
We know that the called function (ff_chroma_inter_body_mmxext)
doesn't touch the redzone, and thus will be kept intact - thus,
this doesn't fix any bug per se.

However, valgrind's memcheck tool intentionally assumes that the
redzone is clobbered on every function call and function return
(see a long comment in valgrind/memcheck/mc_main.c). This avoids
false positives in that tool, at the cost of an extra stack pointer
adjustment.

The other alternative would be a valgrind suppression for this issue,
but that's an extra burden for everybody that wants to run libavcodec
within valgrind.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-06-10 16:31:48 +03:00
Martin Storsjö
0776e0ef6b adpcm: Write the proper predictor in trellis mode in IMA QT 
The actual predictor value, set by the trellis code, never
was written back into the variable that was written into
the block header. This was accidentally removed in b304244b.

This significantly improves the audio quality of the trellis
case, which was plain broken since b304244b.

Encoding IMA QT with trellis still actually gives a slightly
worse quality than without trellis, since the trellis encoder
doesn't use the exact same way of rounding as in
adpcm_ima_qt_compress_sample and adpcm_ima_qt_expand_nibble.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-06-10 16:28:47 +03:00
Michael Niedermayer
0f0f626048 avformat/rawdec: Increase probe score when "Content-Type: image/jpeg" is found at the file start 
Based-on code by: Carl Eugen Hoyos and Andrey Utkin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-10 14:42:19 +02:00
Carl Eugen Hoyos
5482780a3b Allow values >31bit for -analyzeduration. 2014-06-10 14:28:34 +02:00
Michael Niedermayer
ec2b6ee59a avformat/utils: dont wait for a first dts on demuxers which have AVFMT_NOTIMESTAMPS set 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-10 14:22:13 +02:00
Michael Niedermayer
b45a451dbe avformat/rawdec: mark raw vc1 and mjpeg as having no timestamps 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-10 14:21:24 +02:00
Michael Niedermayer
65571ee4e3 avformat/rawdec: add FF_DEF_RAWVIDEO_DEMUXER2, which allows specifying the flags 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-10 14:20:39 +02:00
Michael Niedermayer
2351ea8a2e avformat/nutenc: Fix error handling in write_sm_data() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-10 04:00:06 +02:00
Michael Niedermayer
9c9eac5c26 tools/fourcc2pixfmt: Avoid using non public AV_PIX_FMT_NB 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-10 04:00:06 +02:00
Carl Eugen Hoyos
958168d505 lavf/mpegts: Reduce number of "Predefined SLConfigDescriptor" warnings shown. 2014-06-09 23:20:14 +02:00
Billy Shambrook
3c2d9f86c7 ffprobe: add rc_max_rate to stream output 
The value is used by some bitstream to mark the maximum bit rate.

See thread:
Subject: [FFmpeg-devel] [PATCH] Add rc_max_rate to ffprobe stream output
Date: Sun,  1 Jun 2014 17:36:36 +0100
To: ffmpeg-devel@ffmpeg.org

http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/178461

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2014-06-09 23:19:33 +02:00
Michael Niedermayer
06f576c4ab avcodec/x86/dct_init: fix build failure with clang && disable-optimizations 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-09 19:32:41 +02:00
Michael Niedermayer
2d3842f541 avformat: add mjpeg_probe() 
Fixes Ticket3679

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-09 17:52:44 +02:00
Michael Niedermayer
2ffe55a64f avfilter/vf_zoompan: fix mixing of declarations and statements 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-09 17:27:34 +02:00
Michael Niedermayer
375fa06125 Merge commit '1619274fb3' 
* commit '1619274fb3':
  av_dict_set: fix potential memory leak with AV_DICT_DONT_OVERWRITE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-09 17:25:09 +02:00
Michael Niedermayer
383d8ddf29 Merge commit '7b06ddb835' 
* commit '7b06ddb835':
  configure: use .altmacro for gnu as check on arm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-09 16:48:08 +02:00
Ronald S. Bultje
f341340552 swr: handle 64bit overflow check in multiple_resample(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-09 15:24:51 +02:00
Michael Niedermayer
637093a2db avcodec/utvideoenc: skip unused huffman entries 
This very slightly improves compression
Found-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-09 15:11:53 +02:00
Michael Niedermayer
29a1164e60 avcodec/utvideodec: fix use of get_vlc2() 
The max depth is 3

Found-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-09 14:56:00 +02:00
Michael Niedermayer
334aafe565 avcodec/huffman/ff_huff_gen_len_table: support skiping stat=0 entries 
This is probably not the simplest solution but as this is needed for a bugfix,
simplification is left for later.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-09 14:56:00 +02:00
Carl Eugen Hoyos
673716c54b avcodec/utvideodec: Increase vlc len 
Fixes a regression since fb3e380 similar to ticket #2661,
reported by fluffrabbit at aol dot com.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-09 14:56:00 +02:00
Paul B Mahol
4b6cb1cc69 Zoom & Pan filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-06-09 12:41:33 +00:00
Janne Grunau
1619274fb3 av_dict_set: fix potential memory leak with AV_DICT_DONT_OVERWRITE 
av_dict_set leaks it key/value arguments if AV_DICT_DONT_OVERWRITE is
combined with AV_DICT_DONT_STRDUP_{KEY,VAL} and the key exists.
 2014-06-09 12:33:19 +02:00
Janne Grunau
7b06ddb835 configure: use .altmacro for gnu as check on arm 
Clang's integrated assembler (after 3.4) does not yet support the
'.altmacro' directive which is only used in arm asm. Support is planned:
http://llvm.org/bugs/show_bug.cgi?id=18918
 2014-06-09 12:33:19 +02:00
Michael Niedermayer
0accf24b15 cavsdec: fix qp fixed slice handling 
Fixes Ticket3400

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-09 05:47:49 +02:00
Michael Niedermayer
52e563bb2f avformat/cavsvideodec: Fix probing when the file extension is avs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-09 05:17:34 +02:00
James Almer
345f2234d1 x86/scale: fix xmm register count for hscale*_sse2 
xmm6 was being clobbered in ff_hscale8to{15,19}_8_sse2 on Win64

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-09 04:13:23 +02:00