ffmpeg.git
4 years agoMerge commit '59dfc2b0c89f35c5805abee72c2ae4ee7af8e98d'
Michael Niedermayer [Wed, 29 Apr 2015 02:03:54 +0000 (04:03 +0200)]
Merge commit '59dfc2b0c89f35c5805abee72c2ae4ee7af8e98d'

* commit '59dfc2b0c89f35c5805abee72c2ae4ee7af8e98d':
  h263: Drop commented-out code and a related otherwise unused function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c3418201307c6b7a2b3e3be10f33ab4a20a32c3b'
Michael Niedermayer [Wed, 29 Apr 2015 01:55:59 +0000 (03:55 +0200)]
Merge commit 'c3418201307c6b7a2b3e3be10f33ab4a20a32c3b'

* commit 'c3418201307c6b7a2b3e3be10f33ab4a20a32c3b':
  jpeglsenc: Mark codec as init-thread-safe and init-cleanup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3919a4572690894d0a7ad4170d699c52b4748194'
Michael Niedermayer [Wed, 29 Apr 2015 01:45:27 +0000 (03:45 +0200)]
Merge commit '3919a4572690894d0a7ad4170d699c52b4748194'

* commit '3919a4572690894d0a7ad4170d699c52b4748194':
  jpeglsenc: Check memory allocations

Conflicts:
libavcodec/jpeglsenc.c

See: 48214956b2f115e9cadfcdf1ff06a2477c87a295
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f5ba67ee1342b7741200ff637fc3ea3387b68a1b'
Michael Niedermayer [Wed, 29 Apr 2015 01:32:47 +0000 (03:32 +0200)]
Merge commit 'f5ba67ee1342b7741200ff637fc3ea3387b68a1b'

* commit 'f5ba67ee1342b7741200ff637fc3ea3387b68a1b':
  flacenc: Move a scratch buffer to struct used by the function

Conflicts:
libavcodec/flacenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agonutdec: fix illegal count check in decode_main_header
Andreas Cadhalpun [Tue, 28 Apr 2015 20:37:19 +0000 (22:37 +0200)]
nutdec: fix illegal count check in decode_main_header

The existing check has two problems:
 1) i + count can overflow, so that the check '< 256' returns true.
 2) In the (i == 'N') case occurs a j-- so that the loop runs once more.

This can trigger the assertion 'nut->header_len[0] == 0' or cause
segmentation faults or infinite hangs.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agonutdec: fix memleaks on error in nut_read_header
Andreas Cadhalpun [Tue, 28 Apr 2015 18:58:21 +0000 (20:58 +0200)]
nutdec: fix memleaks on error in nut_read_header

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agonutdec: check chapter creation in decode_info_header
Andreas Cadhalpun [Tue, 28 Apr 2015 18:57:59 +0000 (20:57 +0200)]
nutdec: check chapter creation in decode_info_header

This fixes a segmentation fault when accessing the metadata.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agonutdec: check for negative frame rate in decode_info_header
Andreas Cadhalpun [Tue, 28 Apr 2015 18:31:56 +0000 (20:31 +0200)]
nutdec: check for negative frame rate in decode_info_header

A negative frame rate triggers an av_assert2 in av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vqavideo: Use ff_tlog() for byte and opcode tracing
Michael Niedermayer [Tue, 28 Apr 2015 17:55:39 +0000 (19:55 +0200)]
avcodec/vqavideo: Use ff_tlog() for byte and opcode tracing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/dtsdec: Extend DTS core sync word
foo86 [Tue, 28 Apr 2015 14:47:53 +0000 (17:47 +0300)]
avformat/dtsdec: Extend DTS core sync word

Check extended sync word for 16-bit LE and BE core streams to reduce
probability of alias sync detection. Previously sync word extension was
checked only for 14-bit streams.

This follows up the similar change in avcodec/dca_parser.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoh263: Drop commented-out code and a related otherwise unused function
Vittorio Giovara [Tue, 28 Apr 2015 09:38:28 +0000 (10:38 +0100)]
h263: Drop commented-out code and a related otherwise unused function

4 years agojpeglsenc: Mark codec as init-thread-safe and init-cleanup
Vittorio Giovara [Fri, 24 Apr 2015 15:59:33 +0000 (16:59 +0100)]
jpeglsenc: Mark codec as init-thread-safe and init-cleanup

Fixes a memory leak on init failure.

4 years agojpeglsenc: Check memory allocations
Vittorio Giovara [Fri, 24 Apr 2015 15:59:32 +0000 (16:59 +0100)]
jpeglsenc: Check memory allocations

Convert exisiting free functions to av_freep() to avoid accidental
double frees, and always intialize all buffers to NULL.

4 years agoflacenc: Move a scratch buffer to struct used by the function
Vittorio Giovara [Tue, 28 Apr 2015 14:50:39 +0000 (15:50 +0100)]
flacenc: Move a scratch buffer to struct used by the function

This avoids allocating/freeing memory at every function call,
checking its return value, and carrying the error around.

4 years agoffmpeg: remove incorrect network deinit
Michael Niedermayer [Thu, 23 Apr 2015 12:29:47 +0000 (14:29 +0200)]
ffmpeg: remove incorrect network deinit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoapedec: prevent out of array writes in decode_array_0000
Andreas Cadhalpun [Tue, 28 Apr 2015 09:13:43 +0000 (11:13 +0200)]
apedec: prevent out of array writes in decode_array_0000

s->decoded_buffer is allocated with a min_size of:
    2 * FFALIGN(blockstodecode, 8) * sizeof(*s->decoded_buffer)

Then it is assigned to s->decoded[0] (and s->decoded_buffer + FFALIGN(blockstodecode, 8)
to s->decoded[1]) and passed as out buffer to decode_array_0000.

In this function 64 elements of the out buffer are written
unconditionally and outside the array if blockstodecode is too small.

This causes memory corruption, leading to segmentation faults or other
crashes.

Thus change decode_array_0000 to write at most blockstodecode elements
of the out buffer.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoOpenCL: Fix ABI incompatibility issues
Maneesh Gupta [Tue, 28 Apr 2015 07:32:38 +0000 (13:02 +0530)]
OpenCL: Fix ABI incompatibility issues

AVOpenCLDeviceNode and AVOpenCLPlatformNode used fixed static buffer for holding the device and platform name.
This patch modifies these structures to use pointers instead. The memory required to hold the names is
now dynamically allocated, the size for which is determined by querying appropriate OpenCL runtime APIs.

Signed-off-by: Maneesh Gupta <maneesh.gupta@amd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoOpenCL: Avoid potential buffer overflow in cmdutils_opencl.c
Maneesh Gupta [Tue, 28 Apr 2015 07:38:31 +0000 (13:08 +0530)]
OpenCL: Avoid potential buffer overflow in cmdutils_opencl.c

The opt_opencl_bench function copied the device name using strcpy without checking if the source string was larger.
This patch fixes this by replacing the strcpy with av_strlcpy, with the string copy size capped to the destination buffer size.

Signed-off-by: Maneesh Gupta <maneesh.gupta@amd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agowebmdashenc: Fix UTCTiming Element
Vignesh Venkatasubramanian [Mon, 27 Apr 2015 23:26:34 +0000 (16:26 -0700)]
webmdashenc: Fix UTCTiming Element

Remove the direct profile from UTCTiming element. Per DASH spec,
direct profile value should be the time at which the request was
made to the server and not the time at which the manifest was
written. So ffmpeg cannot write this value. This patch removes
the direct profile and write the UTCTiming element with the http
profile only if a URL is passed as a parameter. Update the fate
test to reflect this change.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoapedec: set s->samples only when init_frame_decoder succeeded
Andreas Cadhalpun [Mon, 27 Apr 2015 22:30:51 +0000 (00:30 +0200)]
apedec: set s->samples only when init_frame_decoder succeeded

Otherwise range_start_decoding is not necessarily run and thus
ctx->rc.range still 0 in range_dec_normalize leading to an infinite
loop.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat/webm_chunk: Write first audio packet.
Vignesh Venkatasubramanian [Mon, 27 Apr 2015 21:47:03 +0000 (14:47 -0700)]
libavformat/webm_chunk: Write first audio packet.

Fix a bug where the chunk muxer doesn't write the very first audio
packet (with pts == 0).

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevc: Remove current_sps
Michael Niedermayer [Mon, 27 Apr 2015 21:51:09 +0000 (23:51 +0200)]
avcodec/hevc: Remove current_sps

The variable should not be needed anymore

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests: make sure subtitles tests are run with a rawdiff
Clément Bœsch [Sun, 26 Apr 2015 17:29:40 +0000 (19:29 +0200)]
tests: make sure subtitles tests are run with a rawdiff

This will test properly CRLF with make fate, make fate-subtitles and any
make fate-sub-* test. Before this commit, the rawdiff was triggered only
by make fate-subtitles.

Also make sure fate-sub-* only match the tests relying on fmtstdout
command, to at least avoid failing on MingW. See
https://ffmpeg.org/pipermail/ffmpeg-devel/2015-April/172395.html

4 years agotests/subtitles: fix microdvd crlf in ref
Clément Bœsch [Sun, 26 Apr 2015 17:30:39 +0000 (19:30 +0200)]
tests/subtitles: fix microdvd crlf in ref

4 years agoAdapt libavcodec/tableprint_vlc.h to the av_dlog -> ff_dlog change.
Alexis Ballier [Mon, 27 Apr 2015 15:33:01 +0000 (17:33 +0200)]
Adapt libavcodec/tableprint_vlc.h to the av_dlog -> ff_dlog change.

This fixes the build with --enable-hardcoded-tables that was broken since [8f7b022c8c2f40bf8ddfd90778a4c91424d3a8e5].

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomakefile: add Loongson-3 support
ZhouXiaoyong [Mon, 27 Apr 2015 02:40:29 +0000 (10:40 +0800)]
makefile: add Loongson-3 support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ppc/fdctdsp: POWER LE support in ff_fdct_altivec() delete macros VEC_FMERGEH...
Rong Yan [Mon, 27 Apr 2015 03:29:51 +0000 (03:29 +0000)]
avcodec/ppc/fdctdsp: POWER LE support in ff_fdct_altivec() delete macros VEC_FMERGEH() VEC_FMERGEL(), they where wrong

GCC tool had a bug of PPC intrinsic interpret, which has been fixed in GCC 4.9.1. This bug lead to
errors in two of our previous patches. We found this when we update our GCC tools to 4.9.1 and by
reading the related info on GCC website. We fix our previous error in two separate commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/ppc/swscale_altivec.c: POWER LE support in yuv2planeX_8() delete macro GET_VF...
Rong Yan [Mon, 27 Apr 2015 03:19:45 +0000 (03:19 +0000)]
swscale/ppc/swscale_altivec.c: POWER LE support in yuv2planeX_8() delete macro GET_VF() it was wrong

GCC tool had a bug of PPC intrinsic interpret, which has been fixed in GCC 4.9.1. This bug lead to
errors in two of our previous patches. We found this when we update our GCC tools to 4.9.1 and by
reading the related info on GCC website. We fix our previous error in two separate commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/aviobuf: Do not resize the buffer in ffio_ensure_seekback() if there is...
Michael Niedermayer [Mon, 27 Apr 2015 02:52:01 +0000 (04:52 +0200)]
avformat/aviobuf: Do not resize the buffer in ffio_ensure_seekback() if there is no read function

Without a read function there can never be more data read than the buffer could
hold

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec: optimize mathops for Loongson-3 v1
ZhouXiaoyong [Thu, 16 Apr 2015 06:42:44 +0000 (14:42 +0800)]
avcodec: optimize mathops for Loongson-3 v1

HAVE_LOONGSON is replaced by HAVE_LOONGSON3. Even Loongson-2E and 2F support
Loongson SIMD instructs but have low performance for decoding. We plan to focus
on optimizing Loongson-3A1000, 3B1500 and 3A1500, and modify the configure file
to support Loongson-2 series later by adding HAVE_LOONGSON2.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ffv1enc: set bits_per_raw_sample for 8bit based formats
Michael Niedermayer [Sun, 26 Apr 2015 19:18:42 +0000 (21:18 +0200)]
avcodec/ffv1enc: set bits_per_raw_sample for 8bit based formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ffv1enc: Ensure that bits per raw sample is valid
Michael Niedermayer [Sun, 26 Apr 2015 19:09:17 +0000 (21:09 +0200)]
avcodec/ffv1enc: Ensure that bits per raw sample is valid

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/log: more complete description of av_log function
Matteo Nastasi (mop) [Thu, 23 Apr 2015 12:27:37 +0000 (14:27 +0200)]
avutil/log: more complete description of av_log function

4 years agoavcodec/rv10: Use ff_tlog() for block level tracing
Michael Niedermayer [Sun, 26 Apr 2015 14:29:23 +0000 (16:29 +0200)]
avcodec/rv10: Use ff_tlog() for block level tracing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dvbsubdec: Do not return a value from a function returning void
Michael Niedermayer [Sun, 26 Apr 2015 11:47:12 +0000 (13:47 +0200)]
avcodec/dvbsubdec: Do not return a value from a function returning void

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/interplayvideo: Use ff_tlog() for block level decode tracing
Michael Niedermayer [Sun, 26 Apr 2015 10:31:56 +0000 (12:31 +0200)]
avcodec/interplayvideo: Use ff_tlog() for block level decode tracing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_slice: Change a few asserts to av_assert*
Michael Niedermayer [Sun, 26 Apr 2015 10:28:36 +0000 (12:28 +0200)]
avcodec/h264_slice: Change a few asserts to av_assert*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5aed1d4240d411533c102eec6944aa925b7f4964'
Michael Niedermayer [Sat, 25 Apr 2015 23:20:08 +0000 (01:20 +0200)]
Merge commit '5aed1d4240d411533c102eec6944aa925b7f4964'

* commit '5aed1d4240d411533c102eec6944aa925b7f4964':
  vaapi: Fix -Wimplicit-function-declaration for ff_dlog() usage

See: 8f7b022c8c2f40bf8ddfd90778a4c91424d3a8e5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ituh263dec: Use ff_tlog() for block level information
Michael Niedermayer [Sat, 25 Apr 2015 23:00:05 +0000 (01:00 +0200)]
avcodec/ituh263dec: Use ff_tlog() for block level information

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_cabac: Use ff_tlog() for block level information
Michael Niedermayer [Sat, 25 Apr 2015 22:58:51 +0000 (00:58 +0200)]
avcodec/h264_cabac: Use ff_tlog() for block level information

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovaapi: Fix -Wimplicit-function-declaration for ff_dlog() usage
Rico Tzschichholz [Thu, 23 Apr 2015 13:30:01 +0000 (14:30 +0100)]
vaapi: Fix -Wimplicit-function-declaration for ff_dlog() usage

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoavcodec/mpeg12dec: Make ff_dlog() messages more clear
Michael Niedermayer [Sat, 25 Apr 2015 18:23:28 +0000 (20:23 +0200)]
avcodec/mpeg12dec: Make ff_dlog() messages more clear

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpeg12dec: Change mb decode tracing stuff to use ff_tlog()
Michael Niedermayer [Sat, 25 Apr 2015 17:42:49 +0000 (19:42 +0200)]
avcodec/mpeg12dec: Change mb decode tracing stuff to use ff_tlog()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/softfloat: document av_int2sf()
Michael Niedermayer [Sat, 25 Apr 2015 12:51:02 +0000 (14:51 +0200)]
avutil/softfloat: document av_int2sf()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: add Loongson-3 support
ZhouXiaoyong [Wed, 15 Apr 2015 11:50:01 +0000 (19:50 +0800)]
configure: add Loongson-3 support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mips: disable assembly not supported for Loongson-3
ZhouXiaoyong [Wed, 15 Apr 2015 12:18:15 +0000 (20:18 +0800)]
avcodec/mips: disable assembly not supported for Loongson-3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/snowenc: Mark as FF_CODEC_CAP_INIT_THREADSAFE and FF_CODEC_CAP_INIT_CLEANUP
Michael Niedermayer [Sat, 25 Apr 2015 10:44:04 +0000 (12:44 +0200)]
avcodec/snowenc: Mark as FF_CODEC_CAP_INIT_THREADSAFE and FF_CODEC_CAP_INIT_CLEANUP

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavcodec/snowdec: Mark as FF_CODEC_CAP_INIT_THREADSAFE and FF_CODEC_CAP_INIT_CLEANUP
Michael Niedermayer [Sat, 25 Apr 2015 02:50:47 +0000 (04:50 +0200)]
libavcodec/snowdec: Mark as FF_CODEC_CAP_INIT_THREADSAFE and FF_CODEC_CAP_INIT_CLEANUP

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/format: Add generic trace av_log in av_probe_input_format3()
Michael Niedermayer [Mon, 20 Apr 2015 15:38:56 +0000 (17:38 +0200)]
avformat/format: Add generic trace av_log in av_probe_input_format3()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/movtextdec: Decoding of Bold-Italic_Underlined styles for 3gpp timed text...
Niklesh [Fri, 24 Apr 2015 21:23:26 +0000 (02:53 +0530)]
avcodec/movtextdec: Decoding of Bold-Italic_Underlined styles for 3gpp timed text subtitles

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
Previous version reviewed-by: Philip Langdale <philipl@overt.org>
Previous version reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'cfdaa4de6c496b0b761c763cd18067cb1af268a7'
Michael Niedermayer [Fri, 24 Apr 2015 21:22:57 +0000 (23:22 +0200)]
Merge commit 'cfdaa4de6c496b0b761c763cd18067cb1af268a7'

* commit 'cfdaa4de6c496b0b761c763cd18067cb1af268a7':
  dss_sp: use lowercase codec name without whitespace

See: 35e855d5b6950887320040da723cf5d5085263a7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/libxvid: remove now redundant init cleanup code
Michael Niedermayer [Fri, 24 Apr 2015 20:50:40 +0000 (22:50 +0200)]
avcodec/libxvid: remove now redundant init cleanup code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '18db1286b04557aa2d2df7efbcb65ae825d5a469'
Michael Niedermayer [Fri, 24 Apr 2015 20:48:29 +0000 (22:48 +0200)]
Merge commit '18db1286b04557aa2d2df7efbcb65ae825d5a469'

* commit '18db1286b04557aa2d2df7efbcb65ae825d5a469':
  libxvid: Make codec use the init-cleanup flag and mark it as init-thread-safe

Conflicts:
libavcodec/libxvid.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'eae7338e1592f4a398b7c3cb9d1ac854b7a44ff8'
Michael Niedermayer [Fri, 24 Apr 2015 20:21:12 +0000 (22:21 +0200)]
Merge commit 'eae7338e1592f4a398b7c3cb9d1ac854b7a44ff8'

* commit 'eae7338e1592f4a398b7c3cb9d1ac854b7a44ff8':
  libx264: Make codec use the init-cleanup flag and mark it as init-thread-safe

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '74a1cad7e3ba79e5b1e5b2e2bcf6179520442679'
Michael Niedermayer [Fri, 24 Apr 2015 20:20:41 +0000 (22:20 +0200)]
Merge commit '74a1cad7e3ba79e5b1e5b2e2bcf6179520442679'

* commit '74a1cad7e3ba79e5b1e5b2e2bcf6179520442679':
  lclenc: Mark codec as init-thread-safe and init-cleanup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'bb428e00ac158244d6691bf135be404e85b66a8b'
Michael Niedermayer [Fri, 24 Apr 2015 20:00:28 +0000 (22:00 +0200)]
Merge commit 'bb428e00ac158244d6691bf135be404e85b66a8b'

* commit 'bb428e00ac158244d6691bf135be404e85b66a8b':
  hqx: Mark codec as init-thread-safe and init-cleanup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '43171886e08b6a2f20a1e2f3ecc95a7984b591cd'
Michael Niedermayer [Fri, 24 Apr 2015 19:48:19 +0000 (21:48 +0200)]
Merge commit '43171886e08b6a2f20a1e2f3ecc95a7984b591cd'

* commit '43171886e08b6a2f20a1e2f3ecc95a7984b591cd':
  huffyuvenc: Mark codec as init-thread-safe and init-cleanup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd90133b77bf69667d10e54de9aae7da223c6876a'
Michael Niedermayer [Fri, 24 Apr 2015 19:34:28 +0000 (21:34 +0200)]
Merge commit 'd90133b77bf69667d10e54de9aae7da223c6876a'

* commit 'd90133b77bf69667d10e54de9aae7da223c6876a':
  asvenc: Mark codec as init-thread-safe and init-cleanup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a4edaeb50fc7510f28a5d79349a7926a182c9930'
Michael Niedermayer [Fri, 24 Apr 2015 19:26:54 +0000 (21:26 +0200)]
Merge commit 'a4edaeb50fc7510f28a5d79349a7926a182c9930'

* commit 'a4edaeb50fc7510f28a5d79349a7926a182c9930':
  hq_hqa: Fix table data for profile 17

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3'
Michael Niedermayer [Fri, 24 Apr 2015 19:16:08 +0000 (21:16 +0200)]
Merge commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3'

* commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3':
  riff: Add GMP4 fourcc for mpeg4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3c04ec04df8cba12f3a7408709ff5c1fddfe8d82'
Michael Niedermayer [Fri, 24 Apr 2015 18:56:41 +0000 (20:56 +0200)]
Merge commit '3c04ec04df8cba12f3a7408709ff5c1fddfe8d82'

* commit '3c04ec04df8cba12f3a7408709ff5c1fddfe8d82':
  riff: Add GLV4 fourcc for mpeg4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5bba3ab0cf7a0238ee1ea31ca2da08ce860fd8f9'
Michael Niedermayer [Fri, 24 Apr 2015 18:49:20 +0000 (20:49 +0200)]
Merge commit '5bba3ab0cf7a0238ee1ea31ca2da08ce860fd8f9'

* commit '5bba3ab0cf7a0238ee1ea31ca2da08ce860fd8f9':
  internal: Make dlog/tlog a no-op when disabled

Conflicts:
libavcodec/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b90adb0aba073f9c1b4abca852119947393ced4c'
Michael Niedermayer [Fri, 24 Apr 2015 18:37:47 +0000 (20:37 +0200)]
Merge commit 'b90adb0aba073f9c1b4abca852119947393ced4c'

* commit 'b90adb0aba073f9c1b4abca852119947393ced4c':
  rtsp: Make sure we don't write too many transport entries into a fixed-size array

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC copy and hv mc functions
Shivraj Patil [Wed, 22 Apr 2015 09:04:44 +0000 (14:34 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC copy and hv mc functions

Incorporated review comment.
Removed "__" from volatile.

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovp9: add fate test for intraonly frames.
Ronald S. Bultje [Thu, 23 Apr 2015 00:59:27 +0000 (20:59 -0400)]
vp9: add fate test for intraonly frames.

Sample available at:
http://downloads.webmproject.org/test_data/libvpx/vp90-2-16-intra-only.webm

4 years agovp9: fix intraonly frame decoding.
Ronald S. Bultje [Thu, 23 Apr 2015 00:57:15 +0000 (20:57 -0400)]
vp9: fix intraonly frame decoding.

4 years agovp9: add fate test for segmentation image-edge issue.
Ronald S. Bultje [Thu, 23 Apr 2015 00:18:52 +0000 (20:18 -0400)]
vp9: add fate test for segmentation image-edge issue.

Sample available at:
http://downloads.webmproject.org/test_data/libvpx/vp90-2-15-segkey_adpq.webm

4 years agovp9: use aligned size to write segmentation map into cache.
Ronald S. Bultje [Thu, 23 Apr 2015 00:14:19 +0000 (20:14 -0400)]
vp9: use aligned size to write segmentation map into cache.

The unaligned size is not handled in setctx_2d(), causing edges of images
to have improper segmentation prediction, which causes visual artifacts
at image edges a few frames later.

4 years agovp9: remove another optimization branch in iadst16 which causes overflows.
Ronald S. Bultje [Wed, 22 Apr 2015 19:48:37 +0000 (15:48 -0400)]
vp9: remove another optimization branch in iadst16 which causes overflows.

See sample vp90-2-14-resize-fp-tiles-16-8.webm from the vp9 test vector
set to reproduce the issue.

4 years agovp9: add fate tests for show-existing-frame feature.
Ronald S. Bultje [Wed, 22 Apr 2015 16:24:41 +0000 (12:24 -0400)]
vp9: add fate tests for show-existing-frame feature.

Samples available at:
http://downloads.webmproject.org/test_data/libvpx/vp90-2-10-show-existing-frame.webm
http://downloads.webmproject.org/test_data/libvpx/vp90-2-10-show-existing-frame2.webm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovp9: add lf_deltas fate test.
Ronald S. Bultje [Wed, 22 Apr 2015 15:51:03 +0000 (11:51 -0400)]
vp9: add lf_deltas fate test.

Sample available at:
http://downloads.webmproject.org/test_data/libvpx/vp90-2-09-lf_deltas.webm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodss_sp: use lowercase codec name without whitespace
Andreas Cadhalpun [Wed, 22 Apr 2015 12:42:08 +0000 (14:42 +0200)]
dss_sp: use lowercase codec name without whitespace

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agolibxvid: Make codec use the init-cleanup flag and mark it as init-thread-safe
Vittorio Giovara [Mon, 6 Apr 2015 23:47:18 +0000 (01:47 +0200)]
libxvid: Make codec use the init-cleanup flag and mark it as init-thread-safe

This takes care of memory leaks on init error.

4 years agolibx264: Make codec use the init-cleanup flag and mark it as init-thread-safe
Vittorio Giovara [Mon, 6 Apr 2015 23:47:18 +0000 (01:47 +0200)]
libx264: Make codec use the init-cleanup flag and mark it as init-thread-safe

This takes care of memory leaks on init error.

4 years agolclenc: Mark codec as init-thread-safe and init-cleanup
Vittorio Giovara [Mon, 6 Apr 2015 23:47:18 +0000 (01:47 +0200)]
lclenc: Mark codec as init-thread-safe and init-cleanup

4 years agohqx: Mark codec as init-thread-safe and init-cleanup
Vittorio Giovara [Mon, 6 Apr 2015 22:40:37 +0000 (00:40 +0200)]
hqx: Mark codec as init-thread-safe and init-cleanup

4 years agohuffyuvenc: Mark codec as init-thread-safe and init-cleanup
Vittorio Giovara [Mon, 6 Apr 2015 23:47:18 +0000 (01:47 +0200)]
huffyuvenc: Mark codec as init-thread-safe and init-cleanup

4 years agoasvenc: Mark codec as init-thread-safe and init-cleanup
Vittorio Giovara [Mon, 6 Apr 2015 23:48:12 +0000 (01:48 +0200)]
asvenc: Mark codec as init-thread-safe and init-cleanup

4 years agohq_hqa: Fix table data for profile 17
Vittorio Giovara [Thu, 23 Apr 2015 10:29:53 +0000 (11:29 +0100)]
hq_hqa: Fix table data for profile 17

The table had a wrong table height and was missing the first line of bytes.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoriff: Add GMP4 fourcc for mpeg4
Vittorio Giovara [Thu, 23 Apr 2015 12:25:20 +0000 (13:25 +0100)]
riff: Add GMP4 fourcc for mpeg4

4 years agoriff: Add GLV4 fourcc for mpeg4
Vittorio Giovara [Tue, 21 Apr 2015 12:10:00 +0000 (13:10 +0100)]
riff: Add GLV4 fourcc for mpeg4

4 years agointernal: Make dlog/tlog a no-op when disabled
Vittorio Giovara [Tue, 21 Apr 2015 12:24:18 +0000 (13:24 +0100)]
internal: Make dlog/tlog a no-op when disabled

Improves Coverity analysis, avoiding "double semicolon" CIDs.

4 years agortsp: Make sure we don't write too many transport entries into a fixed-size array
Martin Storsjö [Fri, 24 Apr 2015 09:38:09 +0000 (12:38 +0300)]
rtsp: Make sure we don't write too many transport entries into a fixed-size array

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavformat/mp3: large id3 tags break concatenated file detection
wm4 [Fri, 24 Apr 2015 10:26:39 +0000 (12:26 +0200)]
avformat/mp3: large id3 tags break concatenated file detection

If the file size is much larger than what is indicated in the XING
header, the demuxer assumes it's a concatenated file, and throws away
the (presumably) incorrect duration information. Unfortunately, this
also triggers if the id3 tags are very large (embedded pictures and
such). Then the half-baked heuristic not only breaks the duration
display, but also gapless audio.

Fix it by subtracting the size of the headers (the check is off by some
bytes, but that doesn't matter at all). Note that there could be an
arbitrary amount of tags _after_ the mp3 data, but hopefully these are
not too large to trigger the heuristic in practice.

Also add a warning when this happens.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavd/v4l2: print buffer flags in case of error
Giorgio Vazzana [Thu, 16 Oct 2014 09:10:03 +0000 (11:10 +0200)]
lavd/v4l2: print buffer flags in case of error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/frame: fix everythnig/everything typo
Clément Bœsch [Fri, 24 Apr 2015 08:57:03 +0000 (10:57 +0200)]
avutil/frame: fix everythnig/everything typo

4 years agolibvpxdec: cosmetics: reindent
James Zern [Wed, 22 Apr 2015 21:16:39 +0000 (14:16 -0700)]
libvpxdec: cosmetics: reindent

Signed-off-by: James Zern <jzern@google.com>
4 years agolibvpxenc: cosmetics: reindent
James Zern [Wed, 22 Apr 2015 21:16:06 +0000 (14:16 -0700)]
libvpxenc: cosmetics: reindent

Signed-off-by: James Zern <jzern@google.com>
4 years agolibvpxenc: only set noise reduction w/vp8
James Zern [Tue, 21 Apr 2015 07:03:00 +0000 (00:03 -0700)]
libvpxenc: only set noise reduction w/vp8

this quiets a warning:
Failed to set VP8E_SET_NOISE_SENSITIVITY codec control: Unspecified
internal error

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Zern <jzern@google.com>
4 years agogit-howto.texi: fix a typo
James Zern [Wed, 22 Apr 2015 21:17:19 +0000 (14:17 -0700)]
git-howto.texi: fix a typo

replace 'Refer to and to sync...' with a reference to the section that
discusses updated the source tree.

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Zern <jzern@google.com>
4 years agoavformat/wvdec: fix seeking
wm4 [Thu, 23 Apr 2015 11:33:06 +0000 (13:33 +0200)]
avformat/wvdec: fix seeking

While I'm not sure why exactly sure why the old code could end up in the
wrong position, using the generic index code is much simpler and is
known to work correctly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1bd2646a6da808f6f9881525771db098c54bc3d2'
Michael Niedermayer [Fri, 24 Apr 2015 01:01:56 +0000 (03:01 +0200)]
Merge commit '1bd2646a6da808f6f9881525771db098c54bc3d2'

* commit '1bd2646a6da808f6f9881525771db098c54bc3d2':
  rtpenc_jpeg: Handle case of picture dimensions not dividing by 8

Conflicts:
libavformat/rtpenc_jpeg.c

See: 7f64a7503b19b39f1251e4380987034c569bebf5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'eb7ddb5066843ab16caf33b05eafb2576648b797'
Michael Niedermayer [Fri, 24 Apr 2015 00:50:47 +0000 (02:50 +0200)]
Merge commit 'eb7ddb5066843ab16caf33b05eafb2576648b797'

* commit 'eb7ddb5066843ab16caf33b05eafb2576648b797':
  rtsp: Don't warn about unparsed time ranges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests/fate-run: do not attempt to parse tiny_psnrs output if it failed
Michael Niedermayer [Thu, 23 Apr 2015 02:27:56 +0000 (04:27 +0200)]
tests/fate-run: do not attempt to parse tiny_psnrs output if it failed

This avoids confusing syntax errors with awk later

Likely fixes awk errors at:
http://buildd.debian-ports.org/status/fetch.php?pkg=ffmpeg&arch=sparc64&ver=7%3A2.6.2-1&stamp=1428928967

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Thanks-to: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> for the link
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoalac: reject rice_limit 0 if compression is used
Andreas Cadhalpun [Thu, 23 Apr 2015 22:01:43 +0000 (00:01 +0200)]
alac: reject rice_limit 0 if compression is used

If rice_limit is 0, k can be 0 in decode_scalar, which calls show_bits(gb, k).

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortpenc_jpeg: Handle case of picture dimensions not dividing by 8
Andrey Utkin [Fri, 10 Apr 2015 21:54:10 +0000 (00:54 +0300)]
rtpenc_jpeg: Handle case of picture dimensions not dividing by 8

This fixes the calculation of the number of needed blocks to make
sure that ALL pixels are represented by the result.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortsp: Don't warn about unparsed time ranges
Martin Storsjö [Wed, 22 Apr 2015 20:15:58 +0000 (23:15 +0300)]
rtsp: Don't warn about unparsed time ranges

This removes the error logging added in 4e54432164.

This avoids warnings about "Invalid interval start specification 'now'"
for live rtsp streams.

We only try to parse some of the many valid values for time ranges
in RTSP - the other ones are fully valid but not interesting for the
use case in rtsp.c, so we shouldn't warn about them.

(Parsing the time ranges is needed to allow seeking, but e.g. setting
the current realtime clock for the start time doesn't make sense.
av_parse_time has got a different mode for parsing absolute times
as well, which can handle the special case "now", but that doesn't
make much sense for this particular use in rtsp.c.)

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoMerge commit '358b7ec3099eca6e999ad9dc0da0a23571a7a2f8'
Michael Niedermayer [Thu, 23 Apr 2015 20:16:01 +0000 (22:16 +0200)]
Merge commit '358b7ec3099eca6e999ad9dc0da0a23571a7a2f8'

* commit '358b7ec3099eca6e999ad9dc0da0a23571a7a2f8':
  fate: Fix test name for pixfmts tests

Conflicts:
tests/fate-run.sh

See: e1ee0521a698809ed216e9e5c11bd2bbb466ed04
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0a51c7d42a519c63178a4f3e35b8967f21da3a6a'
Michael Niedermayer [Thu, 23 Apr 2015 20:04:28 +0000 (22:04 +0200)]
Merge commit '0a51c7d42a519c63178a4f3e35b8967f21da3a6a'

* commit '0a51c7d42a519c63178a4f3e35b8967f21da3a6a':
  prores: Set the bits_per_coded_sample for alpha pix_fmt

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '28eddef689f2b4843a84f7d05fd9614246f92cc4'
Michael Niedermayer [Thu, 23 Apr 2015 19:57:12 +0000 (21:57 +0200)]
Merge commit '28eddef689f2b4843a84f7d05fd9614246f92cc4'

* commit '28eddef689f2b4843a84f7d05fd9614246f92cc4':
  hq_hqa: Validate get_vlc2 return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>