chromium/third_party/ffmpeg.git
31 hours agoMark ffmpeg as "no chromium code" 63/70963/1 master
Brett Wilson [Wed, 23 Jul 2014 18:10:48 +0000 (11:10 -0700)]
Mark ffmpeg as "no chromium code"

It generates Clang warnings. This matches the GYP build.

6 days agoAdd workaround for missing loadable_module support on Linux. 17/70917/2
Dale Curtis [Fri, 18 Jul 2014 19:32:34 +0000 (12:32 -0700)]
Add workaround for missing loadable_module support on Linux.

BUG=none
TEST=media_unittests runs.

Change-Id: I738ff400d8e3aab27fb57f6468a54ebefc596a9e

13 days agoIsolate -marm removal to is_chromeos.
Dale Curtis [Fri, 11 Jul 2014 23:03:40 +0000 (16:03 -0700)]
Isolate -marm removal to is_chromeos.

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
13 days agoffmpeg_generated.gni is always needed in the ffmpeg BUILD.gn 29/70829/2
Albert J. Wong [Fri, 11 Jul 2014 20:14:17 +0000 (13:14 -0700)]
ffmpeg_generated.gni is always needed in the ffmpeg BUILD.gn

All hail GN. oRZ.

BUG=none

2 weeks agoFix ffmpeg GN build on Windows 80/70780/5
Brett Wilson [Tue, 8 Jul 2014 20:25:41 +0000 (13:25 -0700)]
Fix ffmpeg GN build on Windows

This updates the generated ffmpeg_generated.gni for the cpu_arch renames from a previous patch.

Change-Id: I65b3b885e943eb583f584d08420435f0fd91a571

4 weeks agoAdd x64 as an explicit supported platform 22/70522/3
Paweł Hajdan, Jr [Tue, 17 Jun 2014 01:25:02 +0000 (03:25 +0200)]
Add x64 as an explicit supported platform

This makes it possible to generate gyp files
with just a 64-bit machine.

4 weeks agoExpose end padding information from the demuxer as an AVOption.
Dale Curtis [Mon, 23 Jun 2014 20:14:15 +0000 (13:14 -0700)]
Expose end padding information from the demuxer as an AVOption.

Allows downstream clients to read this using av_opt_get_int().

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
4 weeks agoBUILD.gn fixes for mac/x86 builds 80/70580/3
James Robinson [Fri, 20 Jun 2014 05:19:37 +0000 (22:19 -0700)]
BUILD.gn fixes for mac/x86 builds

This fixes a few errors when running GN on a mac x86 build:

*) The 32 bit intel architecture is spelled x86 in GN, not ia32
*) -fno-omit-frame-pointer is not in cflags so attempting to remove it
is an error
*) += on a variable not already declared is an error in GN

This also fixes up generate_gyp.py's GN path and adds tests.

Change-Id: I59a9888c37f110d34f6ddcea86ada7bd54f29c9e

5 weeks agoPass remaining command-line arguments to ffmpeg's configure 20/70520/2
Paweł Hajdan, Jr [Tue, 17 Jun 2014 01:03:35 +0000 (03:03 +0200)]
Pass remaining command-line arguments to ffmpeg's configure

5 weeks agoChange the sigs file to use c-style comments. 10/70510/1
Albert J. Wong [Sat, 14 Jun 2014 01:36:52 +0000 (18:36 -0700)]
Change the sigs file to use c-style comments.

Allows us to remove "#" comment-style support from generate_stubs.py.

Change-Id: Ic297e2da2eccee88290958a498888e937275d447

5 weeks agoUpdate ffmpeg's GN build to use new yasm assemble format. 89/70489/3
Albert J. Wong [Thu, 12 Jun 2014 23:39:53 +0000 (16:39 -0700)]
Update ffmpeg's GN build to use new yasm assemble format.

This is brettw's patch thatn I'm helping land. It also removes
a presubmit that was never passing.

Change-Id: I451349f68a6c55bc0cace759d3e1d5b5325b30a8

5 weeks agoRevert "avformat/mp3dec: fix start time in light of initial skip samples"
Dale Curtis [Fri, 13 Jun 2014 20:00:30 +0000 (13:00 -0700)]
Revert "avformat/mp3dec: fix start time in light of initial skip samples"

This reverts commit 7546ac2fee40570aa6235cf04329bafdbbb449a4.

Conflicts:
libavformat/mp3dec.c

6 weeks agoavcodec/vorbisdec: Reset first_frame
Michael Niedermayer [Fri, 6 Jun 2014 23:27:40 +0000 (01:27 +0200)]
avcodec/vorbisdec: Reset first_frame

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

Suggested-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 weeks agoavformat/oggparsevorbis: Dont attempt to calculate timestamps from gp=0
Michael Niedermayer [Wed, 11 Jun 2014 16:03:45 +0000 (18:03 +0200)]
avformat/oggparsevorbis: Dont attempt to calculate timestamps from gp=0

Fixes Ticket3710

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 weeks agoavcodec/mpegaudiodec: Reset dither and mdct state
Michael Niedermayer [Thu, 5 Jun 2014 19:23:31 +0000 (21:23 +0200)]
avcodec/mpegaudiodec: Reset dither and mdct state

This makes the mp3 decoder produce the same result when repeatly flushing and decoding

Suggested-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 weeks agoavformat/matroskadec: fix off by 1 error in matroska_read_seek()
Michael Niedermayer [Fri, 30 May 2014 03:21:24 +0000 (05:21 +0200)]
avformat/matroskadec: fix off by 1 error in matroska_read_seek()

Fixes out of array read

Fixes: vp9-opus-crash.webm

Found-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 months agoUpdate config files for MIPS Linux 77/70277/1
Petar Jovanovic [Fri, 23 May 2014 15:59:16 +0000 (17:59 +0200)]
Update config files for MIPS Linux

Recent update to FFmpeg config broke the build of Chromium for MIPS.
This change is a result of two commands:

$ ./chromium/scripts/build_ffmpeg.py linux mipsel
$ ./chromium/scripts/copy_config.sh

BUG= regression build issue
TEST= build Chromium for MIPS Linux

2 months agoUpdate linux-noasm configs for the msan build.
Dale Curtis [Thu, 22 May 2014 17:33:05 +0000 (10:33 -0700)]
Update linux-noasm configs for the msan build.

2 months agoFix ChromiumOS build configuration.
Dale Curtis [Wed, 21 May 2014 20:36:55 +0000 (13:36 -0700)]
Fix ChromiumOS build configuration.

Accidentally dropped when fixing the ChromeOS build config :(

2 months agoUpdate build_ffmpeg.py script to allow error resilience on ChromeOS.
Dale Curtis [Tue, 20 May 2014 23:03:00 +0000 (16:03 -0700)]
Update build_ffmpeg.py script to allow error resilience on ChromeOS.

2 months agoFix ChromeOS configs. Can't disable error resilience.
Dale Curtis [Tue, 20 May 2014 22:19:38 +0000 (15:19 -0700)]
Fix ChromeOS configs.  Can't disable error resilience.

Sadly mpeg4 still requires error resilience and specifying disable
error resilience will silently disable that codec as well.

2 months agoMerge FFmpeg for M37.
Dale Curtis [Tue, 20 May 2014 19:15:39 +0000 (12:15 -0700)]
Merge FFmpeg for M37.

Updates FFmpeg to bebce653e5601ceafa004db0eb6b2c7d4d16f0c0.

2 months agoUpdate readme with merge hash. merge-m37
Dale Curtis [Tue, 20 May 2014 19:13:29 +0000 (12:13 -0700)]
Update readme with merge hash.

2 months agoSynchronize patches with upstream.
Dale Curtis [Tue, 20 May 2014 19:09:05 +0000 (12:09 -0700)]
Synchronize patches with upstream.

2 months agoRevert version.h changes in favor of gyp defines.
Dale Curtis [Tue, 20 May 2014 17:08:07 +0000 (10:08 -0700)]
Revert version.h changes in favor of gyp defines.

2 months agoDisable deprecations in a cleaner way. Fix sigs. Fix flags.
Dale Curtis [Tue, 20 May 2014 00:14:11 +0000 (17:14 -0700)]
Disable deprecations in a cleaner way.  Fix sigs.  Fix flags.

2 months agoFix compilation warnings. Add methods to avoid warnings in media.
Dale Curtis [Mon, 19 May 2014 22:13:50 +0000 (15:13 -0700)]
Fix compilation warnings.  Add methods to avoid warnings in media.

2 months agoUpdated documentation to remove SVN references. 66/69166/4
Dale Curtis [Fri, 7 Mar 2014 21:56:41 +0000 (13:56 -0800)]
Updated documentation to remove SVN references.

We now have a Git only repository!  \o/

BUG=329002
TEST=none

Change-Id: Id22bd7ccdc20afba14b8cc970a9e44fc405c184d

2 months agoMissed configs for Linux.
Dale Curtis [Fri, 16 May 2014 21:04:33 +0000 (14:04 -0700)]
Missed configs for Linux.

2 months agoUpdate configs, gyp, and gn for the FFmpeg Roll.
Dale Curtis [Fri, 16 May 2014 20:54:17 +0000 (13:54 -0700)]
Update configs, gyp, and gn for the FFmpeg Roll.

2 months agoFix impossible constraints error during ARM build.
Dale Curtis [Fri, 16 May 2014 20:40:02 +0000 (13:40 -0700)]
Fix impossible constraints error during ARM build.

Seems related to our compiler version, so upstream may not take...

2 months agoUpdate current patches listing.
Dale Curtis [Fri, 16 May 2014 20:07:45 +0000 (13:07 -0700)]
Update current patches listing.

2 months agoAdd windows support to build_ffmpeg.py. Remove .sh version.
Dale Curtis [Fri, 16 May 2014 20:02:06 +0000 (13:02 -0700)]
Add windows support to build_ffmpeg.py.  Remove .sh version.

Additionally adds a script from Mozilla for dealing with stupid
Cygwin <-> Unix <-> Dos path conversion during compilation.

Additionally removes a dead script and fixes permissions on the
existing scripts.

2 months agoUpdate scripts for FFmpeg roll.
Dale Curtis [Thu, 15 May 2014 23:21:36 +0000 (16:21 -0700)]
Update scripts for FFmpeg roll.

- Disables error resilience.
- Enables ADTS demuxer.
- Enables OPUS parser.
- Fixes duplicated golomb tables.
- Updates switches to disable more unused junk when compiling.

2 months agoRoll FFmpeg for M37.
Dale Curtis [Thu, 15 May 2014 22:32:10 +0000 (15:32 -0700)]
Roll FFmpeg for M37.

Merge point bebce653e5601ceafa004db0eb6b2c7d4d16f0c0.

Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/utils.c
libavformat/matroskadec.c
libavformat/oggdec.c
libavformat/oggparseopus.c
libavutil/version.h

2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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.

2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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.

2 months 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>
2 months 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>
2 months 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>
2 months 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.

2 months 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

2 months 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.

2 months 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()

2 months 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.

2 months 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.

2 months 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.

2 months 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>

2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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.

2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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.

2 months 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.

2 months 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

2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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.

2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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.

2 months 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.

2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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>
2 months 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>