ffmpeg.git
4 years agovignette: reuse already declared ctx.
Clément Bœsch [Fri, 16 May 2014 04:48:41 +0000 (06:48 +0200)]
vignette: reuse already declared ctx.

4 years agoavfilter/vignette: fix input frame memory leak.
Masa Utashiro [Fri, 16 May 2014 04:31:56 +0000 (06:31 +0200)]
avfilter/vignette: fix input frame memory leak.

Fixes Ticket #3642.

4 years agoswresample: add swri_resample_float_avx
James Almer [Thu, 15 May 2014 22:54:00 +0000 (19:54 -0300)]
swresample: add swri_resample_float_avx

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: add check for AVX inline support
James Almer [Thu, 15 May 2014 22:03:02 +0000 (19:03 -0300)]
configure: add check for AVX inline support

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/opusdec: fix some const correctness
Michael Niedermayer [Fri, 16 May 2014 02:38:10 +0000 (04:38 +0200)]
avcodec/opusdec: fix some const correctness

also make a const array static
Fixes 2 warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/cavs: prevent out of array read
Michael Niedermayer [Fri, 16 May 2014 01:02:57 +0000 (03:02 +0200)]
avcodec/cavs: prevent out of array read

The used value should not matter as long as its within the array
as it is multiplied by 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/utils: Fix undefined behavior in avpriv_toupper4
Michael Niedermayer [Fri, 16 May 2014 00:06:00 +0000 (02:06 +0200)]
avcodec/utils: Fix undefined behavior in avpriv_toupper4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoUse av_restrict instead of restrict in libavcodec/opus_celt.c.
Carl Eugen Hoyos [Thu, 15 May 2014 22:43:54 +0000 (00:43 +0200)]
Use av_restrict instead of restrict in libavcodec/opus_celt.c.

4 years agoavcodec/x86/dsputil_mmx: Fix build with clang-usan
Michael Niedermayer [Thu, 15 May 2014 21:44:50 +0000 (23:44 +0200)]
avcodec/x86/dsputil_mmx: Fix build with clang-usan

Found-by: Katerina Barone-Adesi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: sbrdsp: implement SSE qmf_deint_neg
Christophe Gisquet [Fri, 7 Dec 2012 17:26:30 +0000 (18:26 +0100)]
x86: sbrdsp: implement SSE qmf_deint_neg

From 133 (unrolled av_intfloat32 C) to 59 cycles on Arrandale/Win64.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/opus: fix doxygen comments to be associated with the correct fields
Michael Niedermayer [Thu, 15 May 2014 20:41:52 +0000 (22:41 +0200)]
avcodec/opus: fix doxygen comments to be associated with the correct fields

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: bitstream filters require split out side data
Michael Niedermayer [Thu, 15 May 2014 20:35:40 +0000 (22:35 +0200)]
ffmpeg: bitstream filters require split out side data

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoRevert "avcodec/hevc: fix outputted AVFrame.key_frame"
Michael Niedermayer [Thu, 15 May 2014 19:34:34 +0000 (21:34 +0200)]
Revert "avcodec/hevc: fix outputted AVFrame.key_frame"

This is not correct

Requested-by: mraulet
This reverts commit 973de9ebf8796bc2720a9959a9a535cf4023c58a.

4 years agoMerge commit 'd3f5b94762fb803c0f3b29f9ad6c5eaa813998ba'
Michael Niedermayer [Thu, 15 May 2014 19:13:31 +0000 (21:13 +0200)]
Merge commit 'd3f5b94762fb803c0f3b29f9ad6c5eaa813998ba'

* commit 'd3f5b94762fb803c0f3b29f9ad6c5eaa813998ba':
  aarch64: opus NEON iMDCT and FFT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7c5ca546a0747a20c7f7fb5550455c3042699ee9'
Michael Niedermayer [Thu, 15 May 2014 19:06:18 +0000 (21:06 +0200)]
Merge commit '7c5ca546a0747a20c7f7fb5550455c3042699ee9'

* commit '7c5ca546a0747a20c7f7fb5550455c3042699ee9':
  configure: fix enable-libopus help string

See: 434ba17b22c61d968d595c02230c38e0bef1ea24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f'
Michael Niedermayer [Thu, 15 May 2014 19:01:07 +0000 (21:01 +0200)]
Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f'

* commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f':
  build: add avresample after avcodec to FFLIBS

Conflicts:
Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: Add udp broadcast option description
Olivier Langlois [Thu, 15 May 2014 06:22:11 +0000 (02:22 -0400)]
doc: Add udp broadcast option description

Describe the option added in commit f1c167496e41cabc2bd1b890b149e4b34648cad6

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/options: avcodec_copy_context() Check subtitle_header_size instead of setting it
Michael Niedermayer [Thu, 15 May 2014 17:41:38 +0000 (19:41 +0200)]
avcodec/options: avcodec_copy_context() Check subtitle_header_size instead of setting it

The value is already copied in the generic code so it should always match

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3b2fbe67bd63b00331db2a9b213f6d420418a312'
Michael Niedermayer [Thu, 15 May 2014 17:39:06 +0000 (19:39 +0200)]
Merge commit '3b2fbe67bd63b00331db2a9b213f6d420418a312'

* commit '3b2fbe67bd63b00331db2a9b213f6d420418a312':
  lavc: properly handle subtitle_header in avcodec_copy_context()

Conflicts:
libavcodec/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'efc7df6c1f11b20a48e60c3f743ce2331b661973'
Michael Niedermayer [Thu, 15 May 2014 17:31:32 +0000 (19:31 +0200)]
Merge commit 'efc7df6c1f11b20a48e60c3f743ce2331b661973'

* commit 'efc7df6c1f11b20a48e60c3f743ce2331b661973':
  lavc: preserve the original private data in avcodec_copy_context()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf'
Michael Niedermayer [Thu, 15 May 2014 17:24:19 +0000 (19:24 +0200)]
Merge commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf'

* commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf':
  lavf: drop the zero-sized packets hack

Conflicts:
libavformat/mux.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'
Michael Niedermayer [Thu, 15 May 2014 16:51:57 +0000 (18:51 +0200)]
Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'

* commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52':
  lavf: add AVFMT_FLAG_BITEXACT.

Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/flacenc.c
libavformat/movenc.c
libavformat/oggenc.c
libavformat/options_table.h
libavformat/version.h
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFix make checkheaders if VDA is not available.
Carl Eugen Hoyos [Thu, 15 May 2014 17:09:36 +0000 (19:09 +0200)]
Fix make checkheaders if VDA is not available.

4 years agoavcodec/opusdec: switch to swresample
Michael Niedermayer [Thu, 15 May 2014 16:28:45 +0000 (18:28 +0200)]
avcodec/opusdec: switch to swresample

This also fixes linking failures in doc/examples which where apparently
caused by the linking order between avcodec and avresample

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample: swr_close()
Michael Niedermayer [Thu, 15 May 2014 16:27:23 +0000 (18:27 +0200)]
swresample: swr_close()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222'
Michael Niedermayer [Thu, 15 May 2014 12:50:12 +0000 (14:50 +0200)]
Merge commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222'

* commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222':
  lavc: add a native Opus decoder.

Conflicts:
Changelog
configure
libavcodec/version.h

Fate tests pass with both avresample as well as swresample based opus decoder, but
are disabled (reference files are very large so i want to think a day or 2 about
if theres an alternative or if they could be avoided, they also dont match the
official samples)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoaarch64: opus NEON iMDCT and FFT
Janne Grunau [Mon, 28 Apr 2014 15:56:43 +0000 (17:56 +0200)]
aarch64: opus NEON iMDCT and FFT

Opus celt decoding 11% faster and the iMDCT over 2.5 times faster on
Apple's A7.

4 years agoconfigure: fix enable-libopus help string
Tristan Matthews [Wed, 14 May 2014 16:13:49 +0000 (16:13 +0000)]
configure: fix enable-libopus help string

4 years agobuild: add avresample after avcodec to FFLIBS
Janne Grunau [Thu, 15 May 2014 12:53:30 +0000 (14:53 +0200)]
build: add avresample after avcodec to FFLIBS

avcodec might depend on avresample and with --as-needed required symbols
might be get removed if avresample is linked before avcodec.
Fixes link failures of avprobe and avplay on aarch64 with
--enable-neon-clobber-test.

4 years agolavc: properly handle subtitle_header in avcodec_copy_context()
Anton Khirnov [Sat, 5 Apr 2014 05:40:49 +0000 (07:40 +0200)]
lavc: properly handle subtitle_header in avcodec_copy_context()

4 years agolavc: preserve the original private data in avcodec_copy_context()
Anton Khirnov [Sat, 5 Apr 2014 05:38:16 +0000 (07:38 +0200)]
lavc: preserve the original private data in avcodec_copy_context()

If a non-NULL codec was passed to avcodec_alloc_context3(), private data
will be already allocated in dest.

4 years agolavf: drop the zero-sized packets hack
Anton Khirnov [Thu, 1 May 2014 11:11:57 +0000 (13:11 +0200)]
lavf: drop the zero-sized packets hack

There should not be any valid reason anymore for passing completely
empty packets to lavf.
OTOH side data-only packets can be useful.

4 years agolavf: add AVFMT_FLAG_BITEXACT.
Anton Khirnov [Thu, 1 May 2014 08:43:10 +0000 (10:43 +0200)]
lavf: add AVFMT_FLAG_BITEXACT.

Use it instead of checking CODEC_FLAG_BITEXACT in the first stream's
codec context.

Using codec options inside lavf is fragile and can easily break when the
muxing codec context is not the encoding context.

4 years agolavc: add a native Opus decoder.
Anton Khirnov [Thu, 17 Apr 2014 10:51:03 +0000 (12:51 +0200)]
lavc: add a native Opus decoder.

Initial implementation by Andrew D'Addesio <modchipv12@gmail.com> during
GSoC 2012.

Completion by Anton Khirnov <anton@khirnov.net>, sponsored by the
Mozilla Corporation.

Further contributions by:
Christophe Gisquet <christophe.gisquet@gmail.com>
Janne Grunau <janne-libav@jannau.net>
Luca Barbato <lu_zero@gentoo.org>

4 years agolibavformat/mov: Elimitate double reading of COVR metadata if MOV_EXPORT_ALL_METADATA...
Alex Sukhanov [Wed, 14 May 2014 19:10:16 +0000 (12:10 -0700)]
libavformat/mov: Elimitate double reading of COVR metadata if MOV_EXPORT_ALL_METADATA is enabled

Problem: ffmpeg tries to read COVR atom data twice if MOV_EXPORT_ALL_METADATA is enabled.
If COVR atom is the last in the stream, a parsing of such file fails.

Solution: just return immediatelly after mov_read_covr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/libnut: use av_mallocz_array()
Michael Niedermayer [Wed, 14 May 2014 23:56:52 +0000 (01:56 +0200)]
avformat/libnut: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/matroskaenc: use av_mallocz_array()
Michael Niedermayer [Wed, 14 May 2014 23:56:08 +0000 (01:56 +0200)]
avformat/matroskaenc: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vsrc_mandelbrot: use av_malloc_array()
Michael Niedermayer [Wed, 14 May 2014 23:54:36 +0000 (01:54 +0200)]
avfilter/vsrc_mandelbrot: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests/fate/libavutil: run cpu test and display the cpus detected feature set
Michael Niedermayer [Tue, 13 May 2014 16:17:20 +0000 (18:17 +0200)]
tests/fate/libavutil: run cpu test and display the cpus detected feature set

With this the fate clients runtime cpu feature set should be visible

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests/fate-run: add runecho command to run a test and display its output
Michael Niedermayer [Tue, 13 May 2014 16:16:44 +0000 (18:16 +0200)]
tests/fate-run: add runecho command to run a test and display its output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/http: remove never twice executable loop
Michael Niedermayer [Sat, 10 May 2014 18:46:00 +0000 (20:46 +0200)]
avformat/http: remove never twice executable loop

Fixes CID1197069

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevc: fix outputted AVFrame.key_frame
Peter Kovář [Wed, 14 May 2014 17:42:44 +0000 (19:42 +0200)]
avcodec/hevc: fix outputted AVFrame.key_frame

previously it was always 1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: add encoding to --enable-libopus doc.
batguano999 [Wed, 14 May 2014 17:07:00 +0000 (19:07 +0200)]
configure: add encoding to --enable-libopus doc.

4 years agoavutil/dict: delay addition of const from e12a73246d8ce7d0fc4036522688934e26de4bb1...
Michael Niedermayer [Wed, 14 May 2014 13:24:38 +0000 (15:24 +0200)]
avutil/dict: delay addition of const from e12a73246d8ce7d0fc4036522688934e26de4bb1 until next major ABI bump

This unbreaks API

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/fifo: delay addition of const from 78d3453c4a2efef9bc079e8f3458653beafcf990...
Michael Niedermayer [Wed, 14 May 2014 13:24:38 +0000 (15:24 +0200)]
avutil/fifo: delay addition of const from 78d3453c4a2efef9bc079e8f3458653beafcf990 until next major ABI bump

This unbreaks API, for example audacity has more build errors due to this

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/version: add FF_CONST_AVUTIL53
Michael Niedermayer [Wed, 14 May 2014 13:23:31 +0000 (15:23 +0200)]
avutil/version: add FF_CONST_AVUTIL53

This will become "const" on the next major API version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7e90133f6420b1c53652f972b9561600822881ee'
Michael Niedermayer [Wed, 14 May 2014 12:02:19 +0000 (14:02 +0200)]
Merge commit '7e90133f6420b1c53652f972b9561600822881ee'

* commit '7e90133f6420b1c53652f972b9561600822881ee':
  build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not defined

Conflicts:
common.mak

See: efa95968317411179b0016af54745906029c2295
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a738540366c9b114949b7914c0d08e2c28982cfb'
Michael Niedermayer [Wed, 14 May 2014 11:53:55 +0000 (13:53 +0200)]
Merge commit 'a738540366c9b114949b7914c0d08e2c28982cfb'

* commit 'a738540366c9b114949b7914c0d08e2c28982cfb':
  lavf: properly document the distinction between flags and ctx_flags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agobuild: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not defined
Janne Grunau [Tue, 13 May 2014 22:05:27 +0000 (00:05 +0200)]
build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not defined

Avoids including disabled library Makefiles.

4 years agoavfilter/lut3d: move the scale calc out of the inner loop.
Clément Bœsch [Wed, 14 May 2014 05:47:21 +0000 (07:47 +0200)]
avfilter/lut3d: move the scale calc out of the inner loop.

4 years agolavf: properly document the distinction between flags and ctx_flags
Anton Khirnov [Thu, 1 May 2014 08:03:54 +0000 (10:03 +0200)]
lavf: properly document the distinction between flags and ctx_flags

4 years agoavfilter/vf_removelogo: use av_malloc_array()
Michael Niedermayer [Wed, 14 May 2014 04:17:27 +0000 (06:17 +0200)]
avfilter/vf_removelogo: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_hqdn3: use av_malloc_array()
Michael Niedermayer [Wed, 14 May 2014 04:17:05 +0000 (06:17 +0200)]
avfilter/vf_hqdn3: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/libx264: Implement reference frame count limiting based on level
Michael Niedermayer [Sat, 12 Apr 2014 02:23:20 +0000 (04:23 +0200)]
avcodec/libx264: Implement reference frame count limiting based on level

This makes libavcodec/libx264.c behave more similar to the x264 command line
util

Fixes Ticket3307

Implementation based on x264

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/utils: Add check that ensures that the hardcoded struct offsets are valid
Michael Niedermayer [Tue, 13 May 2014 23:31:18 +0000 (01:31 +0200)]
swscale/utils: Add check that ensures that the hardcoded struct offsets are valid

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agobuild: move ebur128 swr dep to configure.
Clément Bœsch [Tue, 13 May 2014 21:13:44 +0000 (23:13 +0200)]
build: move ebur128 swr dep to configure.

4 years agoconfigure: swresample depends on avutil
Michael Niedermayer [Tue, 13 May 2014 20:30:07 +0000 (22:30 +0200)]
configure: swresample depends on avutil

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agocommon.mak: fix (not)building disabled libs
Michael Niedermayer [Tue, 13 May 2014 20:15:52 +0000 (22:15 +0200)]
common.mak: fix (not)building disabled libs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '449511740f06a4675b0066730fa45cdb764ffafc'
Michael Niedermayer [Tue, 13 May 2014 19:36:14 +0000 (21:36 +0200)]
Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'

* commit '449511740f06a4675b0066730fa45cdb764ffafc':
  build: handle library dependencies in configure

Conflicts:
common.mak
configure
libavdevice/Makefile
libavfilter/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodpx: use intfloat.h instead of deprecated intfloat_readwrite.h.
Reimar Döffinger [Sat, 10 May 2014 19:56:35 +0000 (21:56 +0200)]
dpx: use intfloat.h instead of deprecated intfloat_readwrite.h.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
4 years agoMerge commit '9aa4592076d4dbb29d1198b0e258f9f85c0c00b5'
Michael Niedermayer [Tue, 13 May 2014 18:34:22 +0000 (20:34 +0200)]
Merge commit '9aa4592076d4dbb29d1198b0e258f9f85c0c00b5'

* commit '9aa4592076d4dbb29d1198b0e258f9f85c0c00b5':
  aarch64: assembler in clang-3.4 ignores the division by two

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agobuild: handle library dependencies in configure
Janne Grunau [Thu, 1 May 2014 11:18:57 +0000 (13:18 +0200)]
build: handle library dependencies in configure

Instead of setting FFLIBS in each library Makefile configure
exports FFLIBS-$library in config.mak.

4 years agoaarch64: assembler in clang-3.4 ignores the division by two
Janne Grunau [Tue, 13 May 2014 13:47:51 +0000 (15:47 +0200)]
aarch64: assembler in clang-3.4 ignores the division by two

Values are positive powers of two, so just replace it with right shift.

4 years agoUse rac_get_prob branchy version when used within a conditional branch.
Matt Oliver [Mon, 7 Apr 2014 06:57:08 +0000 (16:57 +1000)]
Use rac_get_prob branchy version when used within a conditional branch.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoSupport broadcast destination for udp protocol
Olivier Langlois [Wed, 9 Apr 2014 03:21:52 +0000 (23:21 -0400)]
Support broadcast destination for udp protocol

Use the required socket option SO_BROADCAST to be able to stream to a broadcast
address.

Prior to the patch, trying to stream to a broadcast address was resulting to the
following error:

av_interleaved_write_frame(): Permission denied

The patch has been tested with:

ffmpeg -f v4l2 -framerate 30 -input_format yuyv422 -video_size 640x480 -i /dev/video0 \
 -c:v libx264 -profile:v high -preset ultrafast -tune zerolatency -b:v 500k -pix_fmt yuv420p \
 -f mpegts udp://192.168.1.255:5004?broadcast=1

I have added an option to let the user explicitly request broadcast in order to avoid
ffmpeg to broadcast unintentionally.

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevc: fixing code indenting in hevcpred(cherry picked from commit 28a5916845928de2951...
Mickaël Raulet [Tue, 13 May 2014 06:13:46 +0000 (08:13 +0200)]
hevc: fixing code indenting in hevcpred(cherry picked from commit 28a5916845928de2951013b5398465573b181925)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevc/intrapred: fix indent(cherry picked from commit ab167f3158cf37bd679bda28566170e2...
Mickaël Raulet [Mon, 12 May 2014 23:02:11 +0000 (01:02 +0200)]
hevc/intrapred: fix indent(cherry picked from commit ab167f3158cf37bd679bda28566170e2c3691686)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevc: a much faster implementation of intra prediction (up to 1s on
Mickaël Raulet [Mon, 12 May 2014 22:57:52 +0000 (00:57 +0200)]
hevc: a much faster implementation of intra prediction (up to 1s on
haswell 2.6GHz on basket ball drive all intra qp 27)(cherry picked from commit 5de9739176f0eb4c205e80a91628a0196c9924b2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/asfenc: honor the maximum of 63 payloads
Aaron Graham [Mon, 12 May 2014 22:54:55 +0000 (00:54 +0200)]
avformat/asfenc: honor the maximum of 63 payloads

Fixes Ticket3634

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec: add option to make is_intra_more_likely() from error concealment return...
Michael Niedermayer [Fri, 2 May 2014 16:24:22 +0000 (18:24 +0200)]
avcodec: add option to make is_intra_more_likely() from error concealment return "no"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mp3dec: check the number of frames per buffer size
Michael Niedermayer [Mon, 12 May 2014 19:02:06 +0000 (21:02 +0200)]
avformat/mp3dec: check the number of frames per buffer size

Fixes misdetection of issue3327-libc-2.17.so

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: if the id3 tag is too large for data after it to become available...
Michael Niedermayer [Mon, 12 May 2014 18:42:37 +0000 (20:42 +0200)]
avformat/utils: if the id3 tag is too large for data after it to become available, use the full AVPROBE_SCORE_EXTENSION if extension matches

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: limit probe score in the id3 case only if there is a chance that...
Michael Niedermayer [Mon, 12 May 2014 18:41:32 +0000 (20:41 +0200)]
avformat/utils: limit probe score in the id3 case only if there is a chance that data after the id3 tag will become available

Fixes ticket3327 (sample.mp3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoUse Matroska document version 2 for WebM files if possible.
Carl Eugen Hoyos [Mon, 12 May 2014 16:12:28 +0000 (18:12 +0200)]
Use Matroska document version 2 for WebM files if possible.

Google's plugin for the Internet Explorer refuses to play
files with another document version.

Fixes ticket #3583.

4 years agoFix compilation with --enable-lto --enable-shared with icc.
Carl Eugen Hoyos [Mon, 12 May 2014 12:51:21 +0000 (14:51 +0200)]
Fix compilation with --enable-lto --enable-shared with icc.

4 years agohevcdsp: correctly indicate that hevc_put_hevc_bi_epel_h uses 9 GPRs
Hendrik Leppkes [Mon, 12 May 2014 12:31:24 +0000 (14:31 +0200)]
hevcdsp: correctly indicate that hevc_put_hevc_bi_epel_h uses 9 GPRs

Fixes FATE on Windows.

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/buffer: Use av_malloc_array()
Michael Niedermayer [Mon, 12 May 2014 10:24:41 +0000 (12:24 +0200)]
avfilter/buffer: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/buffersrc: use av_mallocz_array()
Michael Niedermayer [Mon, 12 May 2014 10:24:25 +0000 (12:24 +0200)]
avcodec/buffersrc: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: Ensure log2 is disable based on msvcrt version.
Matt Oliver [Mon, 12 May 2014 07:35:52 +0000 (17:35 +1000)]
configure: Ensure log2 is disable based on msvcrt version.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: Allow log2 with msvc12 onwards.
Matt Oliver [Sun, 11 May 2014 07:40:20 +0000 (17:40 +1000)]
configure: Allow log2 with msvc12 onwards.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vda_h264: fix bistream typo
Michael Niedermayer [Mon, 12 May 2014 01:27:04 +0000 (03:27 +0200)]
avcodec/vda_h264: fix bistream typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1839fafa951308237c4672ffd9a94f927b26eac7'
Michael Niedermayer [Mon, 12 May 2014 00:34:01 +0000 (02:34 +0200)]
Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'

* commit '1839fafa951308237c4672ffd9a94f927b26eac7':
  avconv: Support VDA hwaccel

Conflicts:
Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vda_h264: fix null pointer dereference
Michael Niedermayer [Mon, 12 May 2014 00:25:58 +0000 (02:25 +0200)]
avcodec/vda_h264: fix null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '67afcefb35932b420998f6f3fda46c7c85848a3f'
Michael Niedermayer [Sun, 11 May 2014 23:57:02 +0000 (01:57 +0200)]
Merge commit '67afcefb35932b420998f6f3fda46c7c85848a3f'

* commit '67afcefb35932b420998f6f3fda46c7c85848a3f':
  lavc: Add new VDA hwaccel

Conflicts:
configure
libavcodec/vda.h
libavcodec/vda_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '31a46750c7eafe6bce6a3e4f09853cd0a585292b'
Michael Niedermayer [Sun, 11 May 2014 23:04:27 +0000 (01:04 +0200)]
Merge commit '31a46750c7eafe6bce6a3e4f09853cd0a585292b'

* commit '31a46750c7eafe6bce6a3e4f09853cd0a585292b':
  vda: use hwaccel private data for internal bitstream buffer

Conflicts:
libavcodec/vda.h
libavcodec/vda_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f'
Michael Niedermayer [Sun, 11 May 2014 22:37:12 +0000 (00:37 +0200)]
Merge commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f'

* commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f':
  lavu: Add a pixel format for new VDA hwaccel

Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8'
Michael Niedermayer [Sun, 11 May 2014 22:21:44 +0000 (00:21 +0200)]
Merge commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8'

* commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8':
  lavc: Add hwaccel private data and init/uninit callbacks

Conflicts:
libavcodec/avcodec.h
libavcodec/internal.h
libavcodec/pthread_frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436'
Michael Niedermayer [Sun, 11 May 2014 22:06:35 +0000 (00:06 +0200)]
Merge commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436'

* commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436':
  hwaccel: Support specific frame allocators

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a871ef0cc936612bdb0e643196be72efcf0c8986'
Michael Niedermayer [Sun, 11 May 2014 21:49:13 +0000 (23:49 +0200)]
Merge commit 'a871ef0cc936612bdb0e643196be72efcf0c8986'

* commit 'a871ef0cc936612bdb0e643196be72efcf0c8986':
  hwaccel: Rename priv_data_size to frame_priv_data_size

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '08bb2567586599d62a282c4cd31567a0807f3d92'
Michael Niedermayer [Sun, 11 May 2014 21:39:47 +0000 (23:39 +0200)]
Merge commit '08bb2567586599d62a282c4cd31567a0807f3d92'

* commit '08bb2567586599d62a282c4cd31567a0807f3d92':
  lavc: document which parts of AVHWAccel are private.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f'
Michael Niedermayer [Sun, 11 May 2014 21:28:40 +0000 (23:28 +0200)]
Merge commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f'

* commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f':
  lavc: set AVCodecContext.hwaccel in ff_get_format()

Conflicts:
libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425'
Michael Niedermayer [Sun, 11 May 2014 19:48:32 +0000 (21:48 +0200)]
Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425'

* commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425':
  lavc: Add an internal wrapper around get_format()

Conflicts:
libavcodec/h264_slice.c
libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dct: use av_malloc_array()
Michael Niedermayer [Sun, 11 May 2014 18:06:45 +0000 (20:06 +0200)]
avcodec/dct: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/cinepakenc: use av_malloc_array()
Michael Niedermayer [Sun, 11 May 2014 18:06:28 +0000 (20:06 +0200)]
avcodec/cinepakenc: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavconv: Support VDA hwaccel
Anton Khirnov [Mon, 24 Mar 2014 01:02:33 +0000 (02:02 +0100)]
avconv: Support VDA hwaccel

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agolavc: Add new VDA hwaccel
Anton Khirnov [Mon, 24 Mar 2014 00:59:02 +0000 (01:59 +0100)]
lavc: Add new VDA hwaccel

It leverages the new hwaccel 1.2 features:

- get_buffer2 is never called
- the internal context is automatically initialized/deinitialized

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agovda: use hwaccel private data for internal bitstream buffer
Anton Khirnov [Thu, 6 Mar 2014 18:02:29 +0000 (19:02 +0100)]
vda: use hwaccel private data for internal bitstream buffer

4 years agolavu: Add a pixel format for new VDA hwaccel
Anton Khirnov [Thu, 6 Mar 2014 13:07:42 +0000 (14:07 +0100)]
lavu: Add a pixel format for new VDA hwaccel

The current hwaccel is broken and cannot be fixed in a compatible
way. It will be deprecated and replaced with a new one.

4 years agolavc: Add hwaccel private data and init/uninit callbacks
Anton Khirnov [Thu, 6 Mar 2014 17:37:42 +0000 (18:37 +0100)]
lavc: Add hwaccel private data and init/uninit callbacks

4 years agohwaccel: Support specific frame allocators
Luca Barbato [Thu, 8 May 2014 12:43:23 +0000 (14:43 +0200)]
hwaccel: Support specific frame allocators

It would reduce the boilerplate code users have to write.