ffmpeg.git
6 years agoMerge commit 'd256ed78ffe202a4dcc8d625becffc716bfa3977'
Michael Niedermayer [Sun, 18 May 2014 11:09:42 +0000 (13:09 +0200)]
Merge commit 'd256ed78ffe202a4dcc8d625becffc716bfa3977'

* commit 'd256ed78ffe202a4dcc8d625becffc716bfa3977':
  4xm: allocate extradata properly.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fd056029f45a9f6d213d9fce8165632042511d4f'
Michael Niedermayer [Sun, 18 May 2014 11:00:50 +0000 (13:00 +0200)]
Merge commit 'fd056029f45a9f6d213d9fce8165632042511d4f'

* commit 'fd056029f45a9f6d213d9fce8165632042511d4f':
  lavc: add avcodec_free_context().

Conflicts:
doc/APIchanges
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e1b66778b6ee82a192b5895e23c4e135f7269326'
Michael Niedermayer [Sun, 18 May 2014 10:46:28 +0000 (12:46 +0200)]
Merge commit 'e1b66778b6ee82a192b5895e23c4e135f7269326'

* commit 'e1b66778b6ee82a192b5895e23c4e135f7269326':
  lavc: remove the locking code in avcodec_close()

Conflicts:
libavcodec/utils.c

Note, if someone knows of a external codec lib/API, hwaccel or other that requires
locking on its close/free side, please contact ffmpeg-devel.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years ago4xm: allocate extradata properly.
Anton Khirnov [Sat, 3 May 2014 06:50:41 +0000 (08:50 +0200)]
4xm: allocate extradata properly.

Pad it with the required amount of zeros, check for malloc failure.

6 years agolavc: add avcodec_free_context().
Anton Khirnov [Sat, 5 Apr 2014 06:36:00 +0000 (08:36 +0200)]
lavc: add avcodec_free_context().

Right now, the caller has to manually manage some allocated
AVCodecContext fields, like extradata or subtitle_header. This is
fragile and prone to leaks, especially if we want to add more such
fields in the future.

The only reason for this behaviour is so that the AVStream codec context
can be reused for decoding. Such reuse is discouraged anyway, so this
commit is the first step to deprecating it.

6 years agolavc: remove the locking code in avcodec_close()
Anton Khirnov [Sat, 5 Apr 2014 05:09:44 +0000 (07:09 +0200)]
lavc: remove the locking code in avcodec_close()

This function should not modify any global state, so there should be no
reason for any locking.

6 years agoavformat/framehash: switch to AVFMT_FLAG_BITEXACT
Michael Niedermayer [Sun, 18 May 2014 02:02:44 +0000 (04:02 +0200)]
avformat/framehash: switch to AVFMT_FLAG_BITEXACT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mmf: switch to AVFMT_FLAG_BITEXACT
Michael Niedermayer [Sun, 18 May 2014 02:02:44 +0000 (04:02 +0200)]
avformat/mmf: switch to AVFMT_FLAG_BITEXACT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/matroskaenc: switch to AVFMT_FLAG_BITEXACT
Michael Niedermayer [Sun, 18 May 2014 02:02:44 +0000 (04:02 +0200)]
avformat/matroskaenc: switch to AVFMT_FLAG_BITEXACT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mp3enc: switch to AVFMT_FLAG_BITEXACT
Michael Niedermayer [Sun, 18 May 2014 02:02:44 +0000 (04:02 +0200)]
avformat/mp3enc: switch to AVFMT_FLAG_BITEXACT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/nutenc: switch to AVFMT_FLAG_BITEXACT
Michael Niedermayer [Sun, 18 May 2014 02:02:44 +0000 (04:02 +0200)]
avformat/nutenc: switch to AVFMT_FLAG_BITEXACT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/rtpenc: switch to AVFMT_FLAG_BITEXACT
Michael Niedermayer [Sun, 18 May 2014 02:02:44 +0000 (04:02 +0200)]
avformat/rtpenc: switch to AVFMT_FLAG_BITEXACT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/aviobuf/ff_get_line: also accept \r as end of line character
Michael Niedermayer [Mon, 12 May 2014 22:03:30 +0000 (00:03 +0200)]
avformat/aviobuf/ff_get_line: also accept \r as end of line character

Fixes Ticket3108

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: Use av_gettime_relative()
Olivier Langlois [Tue, 6 May 2014 21:16:48 +0000 (17:16 -0400)]
ffplay: Use av_gettime_relative()

Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '584f88409062f7a134e7391887899e8e723ab6ff'
Michael Niedermayer [Sat, 17 May 2014 18:22:53 +0000 (20:22 +0200)]
Merge commit '584f88409062f7a134e7391887899e8e723ab6ff'

* commit '584f88409062f7a134e7391887899e8e723ab6ff':
  riff: Pass block_align to estimate frame duration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: Use av_gettime_relative()
Olivier Langlois [Tue, 6 May 2014 21:16:51 +0000 (17:16 -0400)]
lavf: Use av_gettime_relative()

Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: make vp9 decoder select the parser.
Clément Bœsch [Sat, 17 May 2014 14:13:05 +0000 (16:13 +0200)]
configure: make vp9 decoder select the parser.

The parser is needed. FATE breaks if not present.

6 years agoconfigure: make sure pkg-config flags are populated in FT test.
Clément Bœsch [Sat, 17 May 2014 14:10:45 +0000 (16:10 +0200)]
configure: make sure pkg-config flags are populated in FT test.

6 years agotools: Use av_gettime_relative()
Olivier Langlois [Tue, 6 May 2014 21:16:50 +0000 (17:16 -0400)]
tools: Use av_gettime_relative()

Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: Use av_gettime_relative()
Olivier Langlois [Tue, 6 May 2014 21:16:49 +0000 (17:16 -0400)]
lavc: Use av_gettime_relative()

Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu: add av_gettime_relative()
Olivier Langlois [Mon, 12 May 2014 20:26:37 +0000 (16:26 -0400)]
lavu: add av_gettime_relative()

These functions are using the POSIX clock_gettime() function with the
CLOCK_MONOTONIC clock id. If these are not present on the targeted
platform, the new functions will fallback on using the original realtime functions
av_gettime() and av_usleep().

Monotonic support can be added on other platforms with their
equivalent native system API eventually if possible.

Whenever time is requested to measure relative time, the monotonic clock,
when available, is superior to the system realtime clock because it is
not affected by discontinuous jumps in the system time

In a future step, offering the flexibility to let the user choose between
rt and monotonic clock for avdevices packets will be investigated.

It is very easy to experience the issues that this patch attempt to address
by rewinding back in the past the system time while ffmpeg is running.

this is breaking the ffmpeg report printing (ffmepg.c:print_report()) and
the the rate emulator functionality (-re) without the patch.

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoriff: Pass block_align to estimate frame duration
nu774 [Fri, 16 May 2014 11:25:46 +0000 (20:25 +0900)]
riff: Pass block_align to estimate frame duration

Fix incorrect wSamplesPerBlock(=0) written for ADPCM_IMA_WAV

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 17 May 2014 12:55:57 +0000 (14:55 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix compilation of libavcodec/x86/hevc_deblock.asm with nasm.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 17 May 2014 12:26:23 +0000 (14:26 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: add support for toggling between multiple video filters with the w key
  ffplay: fix typo in docs
  ffplay: try multiple sample rates if audio open fails
  cmdutils: replace usages of "#ifdef __MINGW32__" with "#ifdef _WIN32" because MSVC only defines _WIN32
  ffplay: fix compilation with Visual Studio
  ffplay: increase AV_SYNC_THRESHOLD_MIN to 0.04

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/edgedetect: reuse already defined ctx.
Clément Bœsch [Sat, 17 May 2014 09:47:28 +0000 (11:47 +0200)]
avfilter/edgedetect: reuse already defined ctx.

6 years agoffplay: add support for toggling between multiple video filters with the w key
Marton Balint [Mon, 6 Jan 2014 20:14:23 +0000 (21:14 +0100)]
ffplay: add support for toggling between multiple video filters with the w key

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: fix typo in docs
Marton Balint [Sat, 10 May 2014 12:59:28 +0000 (14:59 +0200)]
ffplay: fix typo in docs

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: try multiple sample rates if audio open fails
Marton Balint [Sat, 10 May 2014 12:32:43 +0000 (14:32 +0200)]
ffplay: try multiple sample rates if audio open fails

Should fix ticket #3509.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agocmdutils: replace usages of "#ifdef __MINGW32__" with "#ifdef _WIN32" because MSVC...
John Peebles [Sat, 17 May 2014 01:44:19 +0000 (21:44 -0400)]
cmdutils: replace usages of "#ifdef __MINGW32__" with "#ifdef _WIN32" because MSVC only defines _WIN32

With the previous patch, this should fix ticket #3580 as well.

Signed-off-by: John Peebles <johnpeeb@gmail.com>
6 years agoffplay: fix compilation with Visual Studio
Marton Balint [Sat, 10 May 2014 11:27:09 +0000 (13:27 +0200)]
ffplay: fix compilation with Visual Studio

Based on a patch by achristensen from trac.ffmpeg.org.

Partially fixes ticket #3580.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: increase AV_SYNC_THRESHOLD_MIN to 0.04
Marton Balint [Sat, 10 May 2014 11:20:56 +0000 (13:20 +0200)]
ffplay: increase AV_SYNC_THRESHOLD_MIN to 0.04

Less than 0.04 sec delays should not be noticable, and it helps us with 50fps
content where some timing errors can cause a frame dup where it is not really
necessary.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoFix compilation of libavcodec/x86/hevc_deblock.asm with nasm.
Carl Eugen Hoyos [Sat, 17 May 2014 10:28:14 +0000 (12:28 +0200)]
Fix compilation of libavcodec/x86/hevc_deblock.asm with nasm.

Suggested-by: Reimar
6 years agoFix alaw and mulaw muxing in caf.
Carl Eugen Hoyos [Fri, 16 May 2014 16:32:35 +0000 (18:32 +0200)]
Fix alaw and mulaw muxing in caf.

Fixes ticket #3644.

6 years agox86/hevc_deblock: use movhps instead of shuffling values
James Almer [Sat, 17 May 2014 00:59:06 +0000 (21:59 -0300)]
x86/hevc_deblock: use movhps instead of shuffling values

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/hevc_deblock: fix label names
James Almer [Sat, 17 May 2014 00:59:05 +0000 (21:59 -0300)]
x86/hevc_deblock: fix label names

Also remove some unnecessary jmps

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/hevc_deblock: fix usage of ABS1
James Almer [Sat, 17 May 2014 00:59:04 +0000 (21:59 -0300)]
x86/hevc_deblock: fix usage of ABS1

The second argument is a temp register for non-SSSE3 cases

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/hevc_deblock: merge movs with other instructions
James Almer [Sat, 17 May 2014 00:59:03 +0000 (21:59 -0300)]
x86/hevc_deblock: merge movs with other instructions

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/filters: fix typo
Michael Niedermayer [Sat, 17 May 2014 02:57:35 +0000 (04:57 +0200)]
doc/filters: fix typo

Found-by: bloody123
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '34e2ce5dde073244ccb2b62f930e96fe612690f7'
Michael Niedermayer [Sat, 17 May 2014 01:13:01 +0000 (03:13 +0200)]
Merge commit '34e2ce5dde073244ccb2b62f930e96fe612690f7'

* commit '34e2ce5dde073244ccb2b62f930e96fe612690f7':
  hlsenc: Set the default codecs to AAC and H264

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: fix key_frame as an IRAP
Mickaël Raulet [Fri, 16 May 2014 23:09:32 +0000 (01:09 +0200)]
hevc: fix key_frame as an IRAP

it was always 1 before with ISOBMFF(cherry picked from commit fb1402b1ec78d80acd6ced76bf78d65560965c4c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohlsenc: Set the default codecs to AAC and H264
Martin Storsjö [Thu, 15 May 2014 18:43:46 +0000 (21:43 +0300)]
hlsenc: Set the default codecs to AAC and H264

Most HLS implementation only support these codecs.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmpproto: info out for unsupported auth vars
Reynaldo H. Verdejo Pinochet [Fri, 16 May 2014 17:39:03 +0000 (13:39 -0400)]
rtmpproto: info out for unsupported auth vars

Should aid debugging badly formatted URLs

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agortmpproto: avoid setting auth var value if null
Reynaldo H. Verdejo Pinochet [Fri, 16 May 2014 17:22:21 +0000 (13:22 -0400)]
rtmpproto: avoid setting auth var value if null

Use default values if parsed variable is found not to
have any value. Avoids crashing at strlen for salt/user
on the auth call afterwards and needless NULL assignments
for the rest (default is already NULL for those).

Should fix Coverity Scan issues #966644 and #966645

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoMerge commit '4d25c2bc76f0a708c2ba470b6bfeb547efe37115'
Michael Niedermayer [Fri, 16 May 2014 20:24:16 +0000 (22:24 +0200)]
Merge commit '4d25c2bc76f0a708c2ba470b6bfeb547efe37115'

* commit '4d25c2bc76f0a708c2ba470b6bfeb547efe37115':
  build: Support building using clang-usan and disable-optimization

Change not merged, as it has been fixed differently and this change
would prevent disabling optimizations with ubsan

See: bebce653e5601ceafa004db0eb6b2c7d4d16f0c0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7c377f0e74de8ab57f6baa64f3ec197c82104764'
Michael Niedermayer [Fri, 16 May 2014 20:02:27 +0000 (22:02 +0200)]
Merge commit '7c377f0e74de8ab57f6baa64f3ec197c82104764'

* commit '7c377f0e74de8ab57f6baa64f3ec197c82104764':
  avisynth: set duration of audio streams

See: ae8e2d7634e09fa57941c4c644ba1b6e4cf9eec6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4735784f1ced27026fbeada5fd31505132e565e9'
Michael Niedermayer [Fri, 16 May 2014 19:22:21 +0000 (21:22 +0200)]
Merge commit '4735784f1ced27026fbeada5fd31505132e565e9'

* commit '4735784f1ced27026fbeada5fd31505132e565e9':
  FATE/opus: increase fuzz for the celt tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/hevc: updated to use x86util macros
plepere [Fri, 16 May 2014 09:44:20 +0000 (11:44 +0200)]
avcodec/x86/hevc: updated to use x86util macros

Reviewed-by: James Almer <jamrial@gmail.com>
Reviewed-by: Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/hevc: added DBF assembly functions
plepere [Thu, 15 May 2014 14:31:11 +0000 (16:31 +0200)]
avcodec/x86/hevc: added DBF assembly functions

Reviewed-by: James Almer <jamrial@gmail.com>
Reviewed-by: Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: Support building using clang-usan and disable-optimization
Katerina Barone-Adesi [Fri, 16 May 2014 16:07:34 +0000 (18:07 +0200)]
build: Support building using clang-usan and disable-optimization

Clang Undefined Behaviour Sanitizer seems to make non-constant constant
expressions, making the compilation fail when they are used within
inline assembly if no optimization is requested.

Add -O1 to the cflags to hide the misbehaviour.

Bug-Id: 683

6 years agoavcodec/mpeg12enc: avoid floats in the aspect ratio info setup code
Michael Niedermayer [Fri, 16 May 2014 16:47:42 +0000 (18:47 +0200)]
avcodec/mpeg12enc: avoid floats in the aspect ratio info setup code

This fixes potential rounding issues with floats, and also
fixes a division by 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg12enc: Favor storing DAR instead of SAR
Frederic Turmel [Thu, 15 May 2014 22:02:16 +0000 (15:02 -0700)]
avcodec/mpeg12enc: Favor storing DAR instead of SAR

fixes Ticket 2689

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoestimate_timings_from_pts: Execute max 1 iteration extra to find more than 1 duration
Michael Niedermayer [Fri, 16 May 2014 14:13:36 +0000 (16:13 +0200)]
estimate_timings_from_pts: Execute max 1 iteration extra to find more than 1 duration

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoestimate_timings_from_pts: Try to get the duration for all streams
Gaullier Nicolas [Wed, 14 May 2014 16:25:13 +0000 (16:25 +0000)]
estimate_timings_from_pts: Try to get the duration for all streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoestimate_timings_from_pts: simplify filesize end check
Michael Niedermayer [Fri, 16 May 2014 13:49:23 +0000 (15:49 +0200)]
estimate_timings_from_pts: simplify filesize end check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoestimate_timings_from_pts: Also consider packet duration
Gaullier Nicolas [Wed, 14 May 2014 16:25:13 +0000 (16:25 +0000)]
estimate_timings_from_pts: Also consider packet duration

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoestimate_timings_from_pts: Warn about A/V streams for which no duration could be set
Gaullier Nicolas [Wed, 14 May 2014 16:25:13 +0000 (16:25 +0000)]
estimate_timings_from_pts: Warn about A/V streams for which no duration could be set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavisynth: set duration of audio streams
Hendrik Leppkes [Thu, 8 May 2014 13:51:15 +0000 (09:51 -0400)]
avisynth: set duration of audio streams

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoFATE/opus: increase fuzz for the celt tests
Anton Khirnov [Thu, 15 May 2014 06:02:59 +0000 (08:02 +0200)]
FATE/opus: increase fuzz for the celt tests

This seems to be needed on some 32bit arches.

6 years agoavfilter/vignette: reindent after previous commit.
Clément Bœsch [Fri, 16 May 2014 04:53:36 +0000 (06:53 +0200)]
avfilter/vignette: reindent after previous commit.

6 years agoavfilter/vignette: add direct rendering.
Clément Bœsch [Fri, 16 May 2014 04:53:18 +0000 (06:53 +0200)]
avfilter/vignette: add direct rendering.

6 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.

6 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.

6 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>
6 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>
6 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>
6 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>
6 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>
6 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.

6 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>
6 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>
6 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>
6 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>
6 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.

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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.

6 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>
6 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>
6 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>
6 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.

6 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

6 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.

6 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()

6 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.

6 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.

6 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.

6 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>

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>