ffmpeg.git
5 years agoFix standalone compilation of the H264 decoder on ppc.
Carl Eugen Hoyos [Sat, 14 Jun 2014 13:44:52 +0000 (15:44 +0200)]
Fix standalone compilation of the H264 decoder on ppc.

5 years agoswr: handle initial negative sample index outside DSP function.
Ronald S. Bultje [Fri, 13 Jun 2014 23:06:30 +0000 (19:06 -0400)]
swr: handle initial negative sample index outside DSP function.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate/aic: force simple idct
Michael Niedermayer [Sat, 14 Jun 2014 10:30:38 +0000 (12:30 +0200)]
fate/aic: force simple idct

This should ensure all platforms use the same idct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: add my (Timothy Gu's) PGP fingerprint and my name for fateserver
Timothy Gu [Wed, 11 Jun 2014 00:37:23 +0000 (17:37 -0700)]
MAINTAINERS: add my (Timothy Gu's) PGP fingerprint and my name for fateserver

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswr: remove unnecessary assignment.
Ronald S. Bultje [Sat, 14 Jun 2014 00:25:51 +0000 (20:25 -0400)]
swr: remove unnecessary assignment.

I don't see dst_incr/dst_incr_frac ever being changed from their
initial value (which is the inverse of this operation), so it seems
to me that this is a no-op.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_asetnsamples: fix pts handling when timebase and 1/samplerate differ
Michael Niedermayer [Sat, 14 Jun 2014 02:22:58 +0000 (04:22 +0200)]
avfilter/af_asetnsamples: fix pts handling when timebase and 1/samplerate differ

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: Fix bitstream filters manipulating AVCodecContext
Michael Niedermayer [Fri, 13 Jun 2014 22:50:50 +0000 (00:50 +0200)]
ffmpeg: Fix bitstream filters manipulating AVCodecContext

Fixes Ticket3715

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/formats: Use av_realloc_array()
Michael Niedermayer [Fri, 13 Jun 2014 21:15:16 +0000 (23:15 +0200)]
avfilter/formats: Use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_dejudder: Use av_mallocz_array()
Michael Niedermayer [Fri, 13 Jun 2014 21:14:38 +0000 (23:14 +0200)]
avfilter/vf_dejudder: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_unsharp: use av_malloc_array()
Michael Niedermayer [Fri, 13 Jun 2014 21:14:18 +0000 (23:14 +0200)]
avfilter/vf_unsharp: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/svq1enc: fix encoding of small widths
Michael Niedermayer [Fri, 13 Jun 2014 18:59:24 +0000 (20:59 +0200)]
avcodec/svq1enc: fix encoding of small widths

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovfilter/avf_showcqt: fix 'mixed declarations and code'
Michael Niedermayer [Fri, 13 Jun 2014 18:32:35 +0000 (20:32 +0200)]
vfilter/avf_showcqt: fix 'mixed declarations and code'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '27631796c9d1b8146ad4a16e6539ecc08afa7565'
Michael Niedermayer [Fri, 13 Jun 2014 17:10:19 +0000 (19:10 +0200)]
Merge commit '27631796c9d1b8146ad4a16e6539ecc08afa7565'

* commit '27631796c9d1b8146ad4a16e6539ecc08afa7565':
  ac3: Only initialize float_dsp for the float encoder variant

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b'
Michael Niedermayer [Fri, 13 Jun 2014 17:03:47 +0000 (19:03 +0200)]
Merge commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b'

* commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b':
  Rename tpel_template.c ---> pel_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo: check that linesize is not too small
Michael Niedermayer [Fri, 13 Jun 2014 15:12:00 +0000 (17:12 +0200)]
avcodec/mpegvideo: check that linesize is not too small

Note linesize is rounded up to at least a multiple of 8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/rv34: fix edge emu with uv stride <= 25
Michael Niedermayer [Fri, 13 Jun 2014 14:13:13 +0000 (16:13 +0200)]
avcodec/rv34: fix edge emu with uv stride <= 25

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: Added Tim Nicholson's key fingerprint
Tim.Nicholson [Fri, 13 Jun 2014 13:41:43 +0000 (14:41 +0100)]
MAINTAINERS: Added Tim Nicholson's key fingerprint

Signed-off-by: Tim.Nicholson <tim.nicholson@bbc.co.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale: Allow the max filter size to be set at compile time
Derek Buitenhuis [Wed, 11 Jun 2014 16:51:49 +0000 (17:51 +0100)]
swscale: Allow the max filter size to be set at compile time

This can help "extreme" resizes, e.g with some 4k stuff.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoac3: Only initialize float_dsp for the float encoder variant
Diego Biurrun [Wed, 11 Jun 2014 12:32:01 +0000 (05:32 -0700)]
ac3: Only initialize float_dsp for the float encoder variant

5 years agoRename tpel_template.c ---> pel_template.c
Diego Biurrun [Thu, 12 Jun 2014 14:05:49 +0000 (07:05 -0700)]
Rename tpel_template.c ---> pel_template.c

The new name more accurately describes what the file is about.

5 years agoavcodec/mpegvideo: Fix psnr calculation with slice threads
Michael Niedermayer [Fri, 13 Jun 2014 11:04:31 +0000 (13:04 +0200)]
avcodec/mpegvideo: Fix psnr calculation with slice threads

This fixes a race condition and use of the wrong field, which become shared
instead of per thread during some AVFrame changes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/wmv2: remove dead code
Michael Niedermayer [Fri, 13 Jun 2014 02:21:52 +0000 (04:21 +0200)]
libavcodec/wmv2: remove dead code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4321e507564b2d8a5dfc630f8d6fefba6fdc1e92'
Michael Niedermayer [Fri, 13 Jun 2014 00:36:22 +0000 (02:36 +0200)]
Merge commit '4321e507564b2d8a5dfc630f8d6fefba6fdc1e92'

* commit '4321e507564b2d8a5dfc630f8d6fefba6fdc1e92':
  configure: use pkg-config for libx264

Not merged as requested by carl
a patch to fix this has been posted by carl to ffmpeg-devel

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo: fix edge emulation with uvlinesize below 25
Michael Niedermayer [Thu, 12 Jun 2014 23:45:23 +0000 (01:45 +0200)]
avcodec/mpegvideo: fix edge emulation with uvlinesize below 25

Fixes fate-vsynth3-wmv2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/avfoundation: Support user selected pixel formats and pixel format autoselection.
sfan5 [Wed, 11 Jun 2014 18:26:33 +0000 (20:26 +0200)]
lavd/avfoundation: Support user selected pixel formats and pixel format autoselection.

Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ceada893bec1e29e457bd2b81d8a0b6fcba5f1f7'
Michael Niedermayer [Thu, 12 Jun 2014 19:30:09 +0000 (21:30 +0200)]
Merge commit 'ceada893bec1e29e457bd2b81d8a0b6fcba5f1f7'

* commit 'ceada893bec1e29e457bd2b81d8a0b6fcba5f1f7':
  libx265: Remove unneeded bit depth check

See: 7ed89addb7f6271d17c2ba21ec11204e37fa9917
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '61a344916d324c8ca52064964478f46c877f02e2'
Michael Niedermayer [Thu, 12 Jun 2014 19:28:45 +0000 (21:28 +0200)]
Merge commit '61a344916d324c8ca52064964478f46c877f02e2'

* commit '61a344916d324c8ca52064964478f46c877f02e2':
  libx265: Add 4:2:2 support

See: 6ee95af8a1181f02e7f3adb9b5d488ba3314e220
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '180e6b48060f97fdd8497320395b61dc85664ecd'
Michael Niedermayer [Thu, 12 Jun 2014 19:20:10 +0000 (21:20 +0200)]
Merge commit '180e6b48060f97fdd8497320395b61dc85664ecd'

* commit '180e6b48060f97fdd8497320395b61dc85664ecd':
  libx265: Actually use X265_API_IMPORTS

See: 4e9b46b0568196e9e1640350a3c6f5f09bfd9e47
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: use pkg-config for libx264
Vittorio Giovara [Tue, 10 Jun 2014 21:46:57 +0000 (17:46 -0400)]
configure: use pkg-config for libx264

5 years agoMerge commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4'
Michael Niedermayer [Thu, 12 Jun 2014 18:25:48 +0000 (20:25 +0200)]
Merge commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4'

* commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4':
  Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs

Conflicts:
libavcodec/ac3enc_float.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibx265: Remove unneeded bit depth check
Derek Buitenhuis [Wed, 11 Jun 2014 20:20:43 +0000 (21:20 +0100)]
libx265: Remove unneeded bit depth check

This is no longer needed since the version bump.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agolibx265: Add 4:2:2 support
Derek Buitenhuis [Wed, 11 Jun 2014 20:19:42 +0000 (21:19 +0100)]
libx265: Add 4:2:2 support

It is also not final yet, so require -strict experimental.

Requires a bump to version 17.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agolibx265: Actually use X265_API_IMPORTS
Derek Buitenhuis [Wed, 11 Jun 2014 19:51:52 +0000 (20:51 +0100)]
libx265: Actually use X265_API_IMPORTS

It obvously needs to be above the include statement.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agolibx265: Remove unneeded bit depth check
Derek Buitenhuis [Wed, 11 Jun 2014 20:20:43 +0000 (21:20 +0100)]
libx265: Remove unneeded bit depth check

This is no longer needed since the version bump.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoRemove some unnecessary CONFIG_FOO_COMPONENT ifdefs
Diego Biurrun [Wed, 11 Jun 2014 12:48:30 +0000 (05:48 -0700)]
Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs

The files are only ever compiled if that condition is true.

5 years agolibx265: Add 4:2:2 support
Derek Buitenhuis [Wed, 11 Jun 2014 20:19:42 +0000 (21:19 +0100)]
libx265: Add 4:2:2 support

It is also not final yet, so require -strict experimental.

Requires a bump to version 17.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agolibx265: Actually use X265_API_IMPORTS
Derek Buitenhuis [Wed, 11 Jun 2014 19:51:52 +0000 (20:51 +0100)]
libx265: Actually use X265_API_IMPORTS

It obvously needs to be above the include statement.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoMerge commit '48e50921337984ba4ec2c1cafe45d43787f84498'
Michael Niedermayer [Thu, 12 Jun 2014 10:02:34 +0000 (12:02 +0200)]
Merge commit '48e50921337984ba4ec2c1cafe45d43787f84498'

* commit '48e50921337984ba4ec2c1cafe45d43787f84498':
  avconv: make -shortest work with streamcopy

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/avf_showcqt: add option for lower resolution
Muhammad Faiz [Thu, 12 Jun 2014 09:09:41 +0000 (09:09 +0000)]
avfilter/avf_showcqt: add option for lower resolution

Resolution can be 1920x1080 or 960x540.

5 years agoavconv: make -shortest work with streamcopy
Anton Khirnov [Tue, 10 Jun 2014 15:41:57 +0000 (17:41 +0200)]
avconv: make -shortest work with streamcopy

CC: libav-stable@libav.org
5 years agovp9/x86: fix overwrite in ipred_vl_4x4_ssse3.
Ronald S. Bultje [Thu, 12 Jun 2014 01:09:54 +0000 (21:09 -0400)]
vp9/x86: fix overwrite in ipred_vl_4x4_ssse3.

Fixes track ticket 3717.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libx264: fix "bitrate reconfiguration"
Michael Niedermayer [Wed, 11 Jun 2014 23:03:46 +0000 (01:03 +0200)]
avcodec/libx264: fix "bitrate reconfiguration"

5 years agoMerge commit '2f4170312f605c1f02a14c01347e94cf46726dbd'
Michael Niedermayer [Wed, 11 Jun 2014 22:55:48 +0000 (00:55 +0200)]
Merge commit '2f4170312f605c1f02a14c01347e94cf46726dbd'

* commit '2f4170312f605c1f02a14c01347e94cf46726dbd':
  libx264: Support bitrate reconfiguration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: huffyuv: fix {add,diff}_int16
Christophe Gisquet [Wed, 11 Jun 2014 19:13:23 +0000 (21:13 +0200)]
x86: huffyuv: fix {add,diff}_int16

They used an extra, undeclared register. Fixes a crash in
fate-vsynth3-ffvhuff444p16

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 agolibx264: Support bitrate reconfiguration
Luca Barbato [Tue, 10 Jun 2014 12:31:48 +0000 (14:31 +0200)]
libx264: Support bitrate reconfiguration

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
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>