ffmpeg.git
5 years agoMerge commit 'cd62c04d009b3baf7582556866a7029291b54573'
Michael Niedermayer [Wed, 11 Jun 2014 20:38:24 +0000 (22:38 +0200)]
Merge commit 'cd62c04d009b3baf7582556866a7029291b54573'

* commit 'cd62c04d009b3baf7582556866a7029291b54573':
  h263enc: keep block_last_index always valid during advanced intra coding

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0ddc53dabbc6f636d062b187ea27934610aaad30'
Michael Niedermayer [Wed, 11 Jun 2014 20:29:40 +0000 (22:29 +0200)]
Merge commit '0ddc53dabbc6f636d062b187ea27934610aaad30'

* commit '0ddc53dabbc6f636d062b187ea27934610aaad30':
  mpegvideo: synchronize AVFrame pointers in ERContext fully

Conflicts:
libavcodec/mpegvideo.c

See: 8ef9dcf1d74aea55bf39f1e479fe67e98d973954
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: increase FF_INPUT_BUFFER_PADDING_SIZE to 32
Michael Niedermayer [Wed, 11 Jun 2014 19:18:14 +0000 (21:18 +0200)]
avcodec: increase FF_INPUT_BUFFER_PADDING_SIZE to 32

Sometimes the input buffers get directly used as raw images and
SIMD optimized video/image filters can sometimes read more than 16 bytes
over the end.
a specific example is the AVX 24bpp to yuv code

This also fixes fate-vsynth3-rgb

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/motion_est: Only clip MVs which are used
Michael Niedermayer [Wed, 11 Jun 2014 20:08:15 +0000 (22:08 +0200)]
avcodec/motion_est: Only clip MVs which are used

Fixes valgrind mpeg4 failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/filters: add forgotten " to zoompan example
Lou Logan [Wed, 11 Jun 2014 20:01:05 +0000 (12:01 -0800)]
doc/filters: add forgotten " to zoompan example

Signed-off-by: Lou Logan <lou@lrcd.com>
5 years agoavfilter/showcqt: move qsort_sparsecoeff closer to where it belongs
Clément Bœsch [Wed, 11 Jun 2014 19:32:22 +0000 (21:32 +0200)]
avfilter/showcqt: move qsort_sparsecoeff closer to where it belongs

5 years agoavfilter/showcqt: fix misc style issues
Clément Bœsch [Wed, 11 Jun 2014 19:30:27 +0000 (21:30 +0200)]
avfilter/showcqt: fix misc style issues

5 years agoh263enc: keep block_last_index always valid during advanced intra coding
Janne Grunau [Tue, 10 Jun 2014 18:50:13 +0000 (20:50 +0200)]
h263enc: keep block_last_index always valid during advanced intra coding

Prevents a triggered assert during fate-vsynth{1,2}-rv20 in
dct_unquantize_h263_intra_c().

5 years agompegvideo: synchronize AVFrame pointers in ERContext fully
Janne Grunau [Wed, 11 Jun 2014 17:40:28 +0000 (19:40 +0200)]
mpegvideo: synchronize AVFrame pointers in ERContext fully

Since error resilience uses AVFrame pointers instead of references it
has to copy NULL pointers too. After a codec flush the last/next frame
pointers in MpegEncContext are NULL and the old pointers remaining in
ERContext are invalid. Fixes a crash in vlc for android thumbnailer.
Reported and debugged by Adrien Maglo <magsoft@videolan.org>.

5 years agoavfilter: add signalstats filter
Clément Bœsch [Wed, 11 Jun 2014 19:14:01 +0000 (21:14 +0200)]
avfilter: add signalstats filter

Signed-off-by: Mark Heath <silicontrip@gmail.com>
Signed-off-by: Dave Rice <dave@dericed.com>
Signed-off-by: Clément Bœsch <u@pkh.me>
5 years agotests: Add aic decoder test
Timothy Gu [Tue, 10 Jun 2014 04:47:43 +0000 (21:47 -0700)]
tests: Add aic decoder test

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/oggparsevorbis: Dont attempt to calculate timestamps from gp=0
Michael Niedermayer [Wed, 11 Jun 2014 16:03:45 +0000 (18:03 +0200)]
avformat/oggparsevorbis: Dont attempt to calculate timestamps from gp=0

Fixes Ticket3710

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: numerous grammar and discrepancy fixes
Timothy Gu [Wed, 11 Jun 2014 00:37:22 +0000 (17:37 -0700)]
MAINTAINERS: numerous grammar and discrepancy fixes

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo_enc: fix padding for odd dimensions and interlaced video
Michael Niedermayer [Wed, 11 Jun 2014 02:59:05 +0000 (04:59 +0200)]
avcodec/mpegvideo_enc: fix padding for odd dimensions and interlaced video

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/qtrleenc: Check that width is a multiple of 4 for grayscale
Michael Niedermayer [Wed, 11 Jun 2014 02:02:53 +0000 (04:02 +0200)]
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>
5 years agofate: Disable qtrlegray 34x34 test
Michael Niedermayer [Wed, 11 Jun 2014 02:01:49 +0000 (04:01 +0200)]
fate: Disable qtrlegray 34x34 test

The encoder lacks support for width % 4 != 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '641e57230b460bef52c88e61087d97c223910bea'
Michael Niedermayer [Wed, 11 Jun 2014 01:10:21 +0000 (03:10 +0200)]
Merge commit '641e57230b460bef52c88e61087d97c223910bea'

* commit '641e57230b460bef52c88e61087d97c223910bea':
  fate: add on2avc audio test

Conflicts:
tests/fate/audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd7705be9617ed691c7a2924a2088de2d96f38af1'
Michael Niedermayer [Wed, 11 Jun 2014 00:57:08 +0000 (02:57 +0200)]
Merge commit 'd7705be9617ed691c7a2924a2088de2d96f38af1'

* commit 'd7705be9617ed691c7a2924a2088de2d96f38af1':
  mpegvideoenc: check color_range

Conflicts:
libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '27860819d508068f056cf48473af04868791ad77'
Michael Niedermayer [Wed, 11 Jun 2014 00:33:58 +0000 (02:33 +0200)]
Merge commit '27860819d508068f056cf48473af04868791ad77'

* commit '27860819d508068f056cf48473af04868791ad77':
  ppc: Consistently use convenience macro for runtime CPU detection

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '205fdd4ea5e1264946917a26fde01e137a485f5a'
Michael Niedermayer [Wed, 11 Jun 2014 00:21:21 +0000 (02:21 +0200)]
Merge commit '205fdd4ea5e1264946917a26fde01e137a485f5a'

* commit '205fdd4ea5e1264946917a26fde01e137a485f5a':
  ppc: Fix runtime CPU detection for apedsp, huffyuvdsp, svq1enc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: add on2avc audio test
Vittorio Giovara [Fri, 23 May 2014 22:16:50 +0000 (18:16 -0400)]
fate: add on2avc audio test

5 years agompegvideoenc: check color_range
Vittorio Giovara [Fri, 23 May 2014 16:39:51 +0000 (12:39 -0400)]
mpegvideoenc: check color_range

Rework the comparison into something simpler to understand.

5 years agoppc: Consistently use convenience macro for runtime CPU detection
Diego Biurrun [Thu, 5 Jun 2014 15:46:47 +0000 (08:46 -0700)]
ppc: Consistently use convenience macro for runtime CPU detection

5 years agoppc: Fix runtime CPU detection for apedsp, huffyuvdsp, svq1enc
Diego Biurrun [Thu, 5 Jun 2014 15:45:59 +0000 (08:45 -0700)]
ppc: Fix runtime CPU detection for apedsp, huffyuvdsp, svq1enc

5 years agoMerge commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd'
Michael Niedermayer [Tue, 10 Jun 2014 21:43:52 +0000 (23:43 +0200)]
Merge commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd'

* commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd':
  mpegts: Provide an option to override the pcr period

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix standalone compilation of the webvtt encoder.
Carl Eugen Hoyos [Tue, 10 Jun 2014 21:47:04 +0000 (23:47 +0200)]
Fix standalone compilation of the webvtt encoder.

5 years agoMerge commit '3f7e94eccd1c0d64679f2c4eda8bb942a158dfac'
Michael Niedermayer [Tue, 10 Jun 2014 21:27:16 +0000 (23:27 +0200)]
Merge commit '3f7e94eccd1c0d64679f2c4eda8bb942a158dfac'

* commit '3f7e94eccd1c0d64679f2c4eda8bb942a158dfac':
  mpegts: Move the option section to the bottom

Conflicts:
libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a736ae1e96b8718af0962106aa40df5f4b246b55'
Michael Niedermayer [Tue, 10 Jun 2014 21:17:29 +0000 (23:17 +0200)]
Merge commit 'a736ae1e96b8718af0962106aa40df5f4b246b55'

* commit 'a736ae1e96b8718af0962106aa40df5f4b246b55':
  doc: Document mpegts muxrate

Conflicts:
doc/muxers.texi

See: 5b76c3a1204944a74f4c1fb4ce1ebe58940e7f78
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegts: Provide an option to override the pcr period
Luca Barbato [Fri, 6 Jun 2014 13:59:25 +0000 (15:59 +0200)]
mpegts: Provide an option to override the pcr period

Certain hardware demuxer have specific restrictions for PCR periodicity.

5 years agompegts: Move the option section to the bottom
Luca Barbato [Tue, 10 Jun 2014 09:57:17 +0000 (11:57 +0200)]
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.

5 years agodoc: Document mpegts muxrate
Luca Barbato [Tue, 10 Jun 2014 09:53:44 +0000 (11:53 +0200)]
doc: Document mpegts muxrate

5 years agotests: add a third, 34x34, target
Christophe Gisquet [Fri, 30 May 2014 09:58:57 +0000 (11:58 +0200)]
tests: add a third, 34x34, target

This should exercise the corner cases of numerous codecs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '570d4b21863b6254d6bbca9c528bede471bb4478'
Michael Niedermayer [Tue, 10 Jun 2014 16:34:38 +0000 (18:34 +0200)]
Merge commit '570d4b21863b6254d6bbca9c528bede471bb4478'

* commit '570d4b21863b6254d6bbca9c528bede471bb4478':
  x86: h264: Don't keep data in the redzone across function calls on 64 bit unix

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0776e0ef6ba4160281ef3fabea43e670f3792b4a'
Michael Niedermayer [Tue, 10 Jun 2014 16:28:26 +0000 (18:28 +0200)]
Merge commit '0776e0ef6ba4160281ef3fabea43e670f3792b4a'

* commit '0776e0ef6ba4160281ef3fabea43e670f3792b4a':
  adpcm: Write the proper predictor in trellis mode in IMA QT

See: fa8f060b75bf9074792a0f9ff4ed002652ef62b8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 10 Jun 2014 16:22:37 +0000 (18:22 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Allow values >31bit for -analyzeduration.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/nutenc: cleaner version check
Michael Niedermayer [Tue, 10 Jun 2014 14:36:41 +0000 (16:36 +0200)]
avformat/nutenc: cleaner version check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/nutenc: Fix error handling in nut_write_packet()
Michael Niedermayer [Tue, 10 Jun 2014 13:41:33 +0000 (15:41 +0200)]
avformat/nutenc: Fix error handling in nut_write_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: h264: Don't keep data in the redzone across function calls on 64 bit unix
Martin Storsjö [Mon, 20 Feb 2012 09:24:35 +0000 (11:24 +0200)]
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>
5 years agoadpcm: Write the proper predictor in trellis mode in IMA QT
Martin Storsjö [Thu, 5 Jun 2014 11:49:14 +0000 (14:49 +0300)]
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>
5 years agoavformat/rawdec: Increase probe score when "Content-Type: image/jpeg" is found at...
Michael Niedermayer [Tue, 10 Jun 2014 12:23:06 +0000 (14:23 +0200)]
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>
5 years agoAllow values >31bit for -analyzeduration.
Carl Eugen Hoyos [Tue, 10 Jun 2014 12:28:34 +0000 (14:28 +0200)]
Allow values >31bit for -analyzeduration.

5 years agoavformat/utils: dont wait for a first dts on demuxers which have AVFMT_NOTIMESTAMPS set
Michael Niedermayer [Tue, 10 Jun 2014 12:22:13 +0000 (14:22 +0200)]
avformat/utils: dont wait for a first dts on demuxers which have AVFMT_NOTIMESTAMPS set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rawdec: mark raw vc1 and mjpeg as having no timestamps
Michael Niedermayer [Tue, 10 Jun 2014 12:21:24 +0000 (14:21 +0200)]
avformat/rawdec: mark raw vc1 and mjpeg as having no timestamps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rawdec: add FF_DEF_RAWVIDEO_DEMUXER2, which allows specifying the flags
Michael Niedermayer [Tue, 10 Jun 2014 12:20:39 +0000 (14:20 +0200)]
avformat/rawdec: add FF_DEF_RAWVIDEO_DEMUXER2, which allows specifying the flags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/nutenc: Fix error handling in write_sm_data()
Michael Niedermayer [Mon, 9 Jun 2014 23:40:32 +0000 (01:40 +0200)]
avformat/nutenc: Fix error handling in write_sm_data()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotools/fourcc2pixfmt: Avoid using non public AV_PIX_FMT_NB
Michael Niedermayer [Mon, 9 Jun 2014 22:44:11 +0000 (00:44 +0200)]
tools/fourcc2pixfmt: Avoid using non public AV_PIX_FMT_NB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/mpegts: Reduce number of "Predefined SLConfigDescriptor" warnings shown.
Carl Eugen Hoyos [Mon, 9 Jun 2014 21:20:14 +0000 (23:20 +0200)]
lavf/mpegts: Reduce number of "Predefined SLConfigDescriptor" warnings shown.

5 years agoffprobe: add rc_max_rate to stream output
Billy Shambrook [Sun, 1 Jun 2014 16:36:36 +0000 (17:36 +0100)]
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>
5 years agoavcodec/x86/dct_init: fix build failure with clang && disable-optimizations
Michael Niedermayer [Mon, 9 Jun 2014 17:32:41 +0000 (19:32 +0200)]
avcodec/x86/dct_init: fix build failure with clang && disable-optimizations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: add mjpeg_probe()
Michael Niedermayer [Mon, 9 Jun 2014 15:52:44 +0000 (17:52 +0200)]
avformat: add mjpeg_probe()

Fixes Ticket3679

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_zoompan: fix mixing of declarations and statements
Michael Niedermayer [Mon, 9 Jun 2014 15:27:34 +0000 (17:27 +0200)]
avfilter/vf_zoompan: fix mixing of declarations and statements

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1619274fb393f55a365cc10f88faa173c9a8e772'
Michael Niedermayer [Mon, 9 Jun 2014 15:13:56 +0000 (17:13 +0200)]
Merge commit '1619274fb393f55a365cc10f88faa173c9a8e772'

* commit '1619274fb393f55a365cc10f88faa173c9a8e772':
  av_dict_set: fix potential memory leak with AV_DICT_DONT_OVERWRITE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7b06ddb8352fe7f434414d7911ced94956bb25b2'
Michael Niedermayer [Mon, 9 Jun 2014 14:47:59 +0000 (16:47 +0200)]
Merge commit '7b06ddb8352fe7f434414d7911ced94956bb25b2'

* commit '7b06ddb8352fe7f434414d7911ced94956bb25b2':
  configure: use .altmacro for gnu as check on arm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswr: handle 64bit overflow check in multiple_resample().
Ronald S. Bultje [Mon, 9 Jun 2014 12:09:49 +0000 (08:09 -0400)]
swr: handle 64bit overflow check in multiple_resample().

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utvideoenc: skip unused huffman entries
Michael Niedermayer [Mon, 9 Jun 2014 12:53:50 +0000 (14:53 +0200)]
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>
5 years agoavcodec/utvideodec: fix use of get_vlc2()
Michael Niedermayer [Mon, 9 Jun 2014 12:50:17 +0000 (14:50 +0200)]
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>
5 years agoavcodec/huffman/ff_huff_gen_len_table: support skiping stat=0 entries
Michael Niedermayer [Mon, 9 Jun 2014 12:49:35 +0000 (14:49 +0200)]
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>
5 years agoavcodec/utvideodec: Increase vlc len
Carl Eugen Hoyos [Thu, 29 May 2014 06:41:15 +0000 (08:41 +0200)]
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>
5 years agoZoom & Pan filter
Paul B Mahol [Mon, 16 Sep 2013 15:31:15 +0000 (15:31 +0000)]
Zoom & Pan filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoav_dict_set: fix potential memory leak with AV_DICT_DONT_OVERWRITE
Janne Grunau [Sun, 8 Jun 2014 15:53:31 +0000 (17:53 +0200)]
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.

5 years agoconfigure: use .altmacro for gnu as check on arm
Janne Grunau [Thu, 29 May 2014 15:04:57 +0000 (17:04 +0200)]
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

5 years agocavsdec: fix qp fixed slice handling
Michael Niedermayer [Mon, 9 Jun 2014 03:47:49 +0000 (05:47 +0200)]
cavsdec: fix qp fixed slice handling

Fixes Ticket3400

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/cavsvideodec: Fix probing when the file extension is avs
Michael Niedermayer [Mon, 9 Jun 2014 03:17:34 +0000 (05:17 +0200)]
avformat/cavsvideodec: Fix probing when the file extension is avs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/scale: fix xmm register count for hscale*_sse2
James Almer [Mon, 9 Jun 2014 01:21:30 +0000 (22:21 -0300)]
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>
5 years agox86/dct32: don't build ff_dct32_float_sse on x86_64
James Almer [Sun, 8 Jun 2014 22:39:21 +0000 (19:39 -0300)]
x86/dct32: don't build ff_dct32_float_sse on x86_64

There's an SSE2 version already, and technically the SSE version
on x86_64 was wrong (using pshufd and pshuflw, SSE2 instructions).

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/options_table: improve max/min rate help text
Michael Niedermayer [Sun, 8 Jun 2014 19:45:39 +0000 (21:45 +0200)]
avcodec/options_table: improve max/min rate help text

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/float_dsp: add missing femms
James Almer [Sun, 8 Jun 2014 15:56:55 +0000 (12:56 -0300)]
x86/float_dsp: add missing femms

It was lost during the port.
Should fix fate on 3dnowext machines.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pthread_slice: Use av_malloc(z)_array()
Michael Niedermayer [Sun, 8 Jun 2014 14:34:50 +0000 (16:34 +0200)]
avcodec/pthread_slice: Use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pthread_frame: Use av_mallocz_array()
Michael Niedermayer [Sun, 8 Jun 2014 14:34:20 +0000 (16:34 +0200)]
avcodec/pthread_frame: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: fix () in TRANSPOSE macro
Michael Niedermayer [Sun, 8 Jun 2014 13:26:18 +0000 (15:26 +0200)]
avcodec: fix () in TRANSPOSE macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/movenc: use av_malloc(z)_array()
Michael Niedermayer [Sun, 8 Jun 2014 13:19:46 +0000 (15:19 +0200)]
avformat/movenc: use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/aacpsy: Use av_mallocz_array()
Michael Niedermayer [Sun, 8 Jun 2014 12:34:31 +0000 (14:34 +0200)]
avcodec/aacpsy:  Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/alsdec: Clear MPEG4AudioConfig so that no use of uninitialized memory is...
Michael Niedermayer [Sun, 8 Jun 2014 12:30:30 +0000 (14:30 +0200)]
avcodec/alsdec: Clear MPEG4AudioConfig so that no use of uninitialized memory is possible

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/float_dsp: port vector_fmul_window to yasm
James Almer [Sun, 8 Jun 2014 07:05:16 +0000 (04:05 -0300)]
x86/float_dsp: port vector_fmul_window to yasm

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: add llauddsp dependancy for wmalossless_decoder
Michael Niedermayer [Sun, 8 Jun 2014 01:10:24 +0000 (03:10 +0200)]
configure: add llauddsp dependancy for wmalossless_decoder

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/vp9: inital AVX2 intra_pred
James Almer [Mon, 19 May 2014 03:02:21 +0000 (00:02 -0300)]
x86/vp9: inital AVX2 intra_pred

tos3k-vp9-b10000.webm on a Core i5-4200U @1.6GHz

1219 decicycles in ff_vp9_ipred_dc_32x32_ssse3, 131070 runs, 2 skips
439 decicycles in ff_vp9_ipred_dc_32x32_avx2, 131070 runs, 2 skips

3570 decicycles in ff_vp9_ipred_dc_top_32x32_ssse3, 4096 runs, 0 skips
2494 decicycles in ff_vp9_ipred_dc_top_32x32_avx2, 4096 runs, 0 skips

1419 decicycles in ff_vp9_ipred_dc_left_32x32_ssse3, 16384 runs, 0 skips
717 decicycles in ff_vp9_ipred_dc_left_32x32_avx2, 16384 runs, 0 skips

2737 decicycles in ff_vp9_ipred_tm_32x32_avx, 1024 runs, 0 skips
2088 decicycles in ff_vp9_ipred_tm_32x32_avx2, 1024 runs, 0 skips

3090 decicycles in ff_vp9_ipred_v_32x32_avx, 512 runs, 0 skips
2226 decicycles in ff_vp9_ipred_v_32x32_avx2, 512 runs, 0 skips

1565 decicycles in ff_vp9_ipred_h_32x32_avx, 1024 runs, 0 skips
922 decicycles in ff_vp9_ipred_h_32x32_avx2, 1024 runs, 0 skips

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc_sei: fix invalid get_bits() in a comment
Michael Niedermayer [Sat, 7 Jun 2014 21:37:27 +0000 (23:37 +0200)]
avcodec/hevc_sei: fix invalid get_bits() in a comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: support setting AVStream.discard
Michael Niedermayer [Sat, 31 May 2014 03:53:06 +0000 (05:53 +0200)]
ffmpeg: support setting AVStream.discard

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_opt: remove unused variable and undocumented and not working command line...
Michael Niedermayer [Sat, 31 May 2014 03:02:35 +0000 (05:02 +0200)]
ffmpeg_opt: remove unused variable and undocumented and not working command line option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tscc2: fix macro ()
Michael Niedermayer [Sat, 7 Jun 2014 15:44:23 +0000 (17:44 +0200)]
avcodec/tscc2: fix macro ()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tta: fix macro ()
Michael Niedermayer [Sat, 7 Jun 2014 15:43:52 +0000 (17:43 +0200)]
avcodec/tta: fix macro ()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_amix: Use av_mallocz_array()
Michael Niedermayer [Sat, 7 Jun 2014 13:06:14 +0000 (15:06 +0200)]
avfilter/af_amix: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_channelmap: Use av_mallocz_array()
Michael Niedermayer [Sat, 7 Jun 2014 13:05:51 +0000 (15:05 +0200)]
avfilter/af_channelmap: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_aphaser: Use av_malloc_array()
Michael Niedermayer [Sat, 7 Jun 2014 13:05:33 +0000 (15:05 +0200)]
avfilter/af_aphaser: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdevice/lavfi: Use av_malloc_array()
Michael Niedermayer [Sat, 7 Jun 2014 13:04:50 +0000 (15:04 +0200)]
avdevice/lavfi: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/udp: fix build on MINIX
Michael Niedermayer [Sat, 7 Jun 2014 12:43:07 +0000 (14:43 +0200)]
avformat/udp: fix build on MINIX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/flvenc: Do not allow creating h263/mpeg4 in flv without unofficial format...
Michael Niedermayer [Sat, 7 Jun 2014 10:03:31 +0000 (12:03 +0200)]
avformat/flvenc: Do not allow creating h263/mpeg4 in flv without unofficial format extensions being enabled.

Found-by: Jean-Baptiste Kempf <jb@videolan.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vorbisdec: Reset first_frame
Michael Niedermayer [Fri, 6 Jun 2014 23:27:40 +0000 (01:27 +0200)]
avcodec/vorbisdec: Reset first_frame

This avoids returning a initial frame after seeking which does
not match what would be received when decoding from the begin.

Suggested-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libvpxenc: update the ranges for "cpu_used" so it matches the "speed" alias
Michael Niedermayer [Fri, 6 Jun 2014 19:21:20 +0000 (21:21 +0200)]
avcodec/libvpxenc: update the ranges for "cpu_used" so it matches the "speed" alias

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libvpxenc: Update the "cpu-used" options default to match the "speed" alias
Rafaël Carré [Fri, 6 Jun 2014 19:01:35 +0000 (21:01 +0200)]
avcodec/libvpxenc: Update the "cpu-used" options default to match the "speed" alias

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3d79d0c93e5b37a35b1b22d6c18699c233aad1ba'
Michael Niedermayer [Fri, 6 Jun 2014 21:42:15 +0000 (23:42 +0200)]
Merge commit '3d79d0c93e5b37a35b1b22d6c18699c233aad1ba'

* commit '3d79d0c93e5b37a35b1b22d6c18699c233aad1ba':
  adpcm: Avoid reading out of bounds in the IMA QT trellis encoder

See: a32765c4252eb106a2ade543026ef6f59e699bfa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '103243ca649cc305129ed0352bf4d97e5ddf4d80'
Michael Niedermayer [Fri, 6 Jun 2014 21:35:03 +0000 (23:35 +0200)]
Merge commit '103243ca649cc305129ed0352bf4d97e5ddf4d80'

* commit '103243ca649cc305129ed0352bf4d97e5ddf4d80':
  oggenc: Set the right AVOption size for the pref_duration option

See: 536baf6cc5d1db789c9f903776dccb7a41b62a6e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f558f0d2da9426c7f5ba346b5b8e6eb720148362'
Michael Niedermayer [Fri, 6 Jun 2014 21:29:17 +0000 (23:29 +0200)]
Merge commit 'f558f0d2da9426c7f5ba346b5b8e6eb720148362'

* commit 'f558f0d2da9426c7f5ba346b5b8e6eb720148362':
  avcodec options: add enum option for color_range

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7c29b7229bedf0c37d09bd02dab88e563adffd3c'
Michael Niedermayer [Fri, 6 Jun 2014 21:19:41 +0000 (23:19 +0200)]
Merge commit '7c29b7229bedf0c37d09bd02dab88e563adffd3c'

* commit '7c29b7229bedf0c37d09bd02dab88e563adffd3c':
  avcodec options: add enum option for colorspace

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'efc2dfe6a0238ec08769626db899ea910be24407'
Michael Niedermayer [Fri, 6 Jun 2014 21:09:22 +0000 (23:09 +0200)]
Merge commit 'efc2dfe6a0238ec08769626db899ea910be24407'

* commit 'efc2dfe6a0238ec08769626db899ea910be24407':
  avcodec options: add enum option for color_trc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bd71c300f9ba7f9875bb5df17ce522e9128bae10'
Michael Niedermayer [Fri, 6 Jun 2014 21:00:09 +0000 (23:00 +0200)]
Merge commit 'bd71c300f9ba7f9875bb5df17ce522e9128bae10'

* commit 'bd71c300f9ba7f9875bb5df17ce522e9128bae10':
  avcodec options: add enum option for color_primaries

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg12enc: store sequence display extension only if we have something to...
Michael Niedermayer [Fri, 6 Jun 2014 20:38:37 +0000 (22:38 +0200)]
avcodec/mpeg12enc: store sequence display extension only if we have something to store in it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8a06794112d02a5707f766b8b38a5d50dfd03898'
Michael Niedermayer [Fri, 6 Jun 2014 20:36:07 +0000 (22:36 +0200)]
Merge commit '8a06794112d02a5707f766b8b38a5d50dfd03898'

* commit '8a06794112d02a5707f766b8b38a5d50dfd03898':
  mpeg2: add sequence display extension information

Conflicts:
libavcodec/mpeg12enc.c
tests/ref/lavf/gxf
tests/ref/lavf/mxf
tests/ref/lavf/mxf_d10
tests/ref/lavf/ts
tests/ref/seek/lavf-gxf
tests/ref/seek/lavf-mxf
tests/ref/seek/lavf-ts
tests/ref/seek/vsynth2-mpeg2-422
tests/ref/seek/vsynth2-mpeg2-idct-int
tests/ref/seek/vsynth2-mpeg2-ilace
tests/ref/seek/vsynth2-mpeg2-ivlc-qprd
tests/ref/seek/vsynth2-mpeg2-thread
tests/ref/seek/vsynth2-mpeg2-thread-ivlc
tests/ref/vsynth/vsynth1-mpeg2
tests/ref/vsynth/vsynth1-mpeg2-422
tests/ref/vsynth/vsynth1-mpeg2-idct-int
tests/ref/vsynth/vsynth1-mpeg2-ilace
tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd
tests/ref/vsynth/vsynth1-mpeg2-thread
tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc
tests/ref/vsynth/vsynth2-mpeg2
tests/ref/vsynth/vsynth2-mpeg2-422
tests/ref/vsynth/vsynth2-mpeg2-idct-int
tests/ref/vsynth/vsynth2-mpeg2-ilace
tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
tests/ref/vsynth/vsynth2-mpeg2-thread
tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohuffyuvdec: trick for plane decoding <= 14bits
Christophe Gisquet [Thu, 5 Jun 2014 21:37:00 +0000 (23:37 +0200)]
huffyuvdec: trick for plane decoding <= 14bits

Refactor the code to minimize code duplication.

Before:
130870 decicycles in g, 1048139 runs, 437 skips
10bits:  9.048
12bits: 10.733

After:
126960 decicycles in g, 1048136 runs, 440 skips
10bits:  8.642
12bits:  9.656

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/matroskaenc: Fix Cues on Audio for WebM DASH
Vignesh Venkatasubramanian [Fri, 6 Jun 2014 18:26:11 +0000 (11:26 -0700)]
lavf/matroskaenc: Fix Cues on Audio for WebM DASH

Fix a change that was broken by [1]. Cues must be added for audio frames
on cluster start for WebM when the DASH flag is passed. Restoring
correct functionality.

[1] http://goo.gl/xYLq7Z

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>