chromium/third_party/ffmpeg.git
33 hours agoMerge "Add ffmpeg signatures for av_log_set_callback" master
Sergey Volk [Mon, 26 Jan 2015 23:55:29 +0000 (15:55 -0800)]
Merge "Add ffmpeg signatures for av_log_set_callback"

4 days agoMerge "[MIPS] Update generate_gyp.py and ffmpeg_generated.gypi"
Dale Curtis [Fri, 23 Jan 2015 20:36:58 +0000 (12:36 -0800)]
Merge "[MIPS] Update generate_gyp.py and ffmpeg_generated.gypi"

5 days agoUse the allocator shim in ffmpegsumo. 63/73563/3
Will Harris [Thu, 22 Jan 2015 04:33:15 +0000 (20:33 -0800)]
Use the allocator shim in ffmpegsumo.

Link ffmpegsumo.dll with the allocator shim code with 2Gb limit. Call into the allocator shim to initilize the crash on NULL from a new DllMain().

BUG=450676, 446032, 444533
TEST=media_unittests

Change-Id: I6b0e5c944f3781e984cee0bc17678b0af7136948

5 days ago[MIPS] Update generate_gyp.py and ffmpeg_generated.gypi 66/73566/1
Petar Jovanovic [Thu, 22 Jan 2015 18:19:48 +0000 (19:19 +0100)]
[MIPS] Update generate_gyp.py and ffmpeg_generated.gypi

Update the script that generate gyp files with support for MIPS.
At the same, upload the generated file ffmpeg_generated.gypi.

6 days agoAdd ffmpeg signatures for av_log_set_callback 62/73562/1
Sergey Volk [Thu, 22 Jan 2015 01:01:24 +0000 (17:01 -0800)]
Add ffmpeg signatures for av_log_set_callback

This will make it possible to call av_log_set_callback from
Chrome (useful for debugging).

Change-Id: I1f7ac5b257621f8729b2dbe554aa23ca7dff208c

11 days agoAdd -lrt to link line, precise needs it for clock_gettime 30/73530/1
James Robinson [Fri, 16 Jan 2015 21:15:29 +0000 (13:15 -0800)]
Add -lrt to link line, precise needs it for clock_gettime

Change-Id: I78bd3466d5b36b5e8b30954bada8774932d53fef

12 days agoMerge "Add //base dep to stubs target"
James Robinson [Fri, 16 Jan 2015 00:01:05 +0000 (16:01 -0800)]
Merge "Add //base dep to stubs target"

12 days agoAdd //base dep to stubs target 16/73516/2
James Robinson [Thu, 15 Jan 2015 23:28:16 +0000 (15:28 -0800)]
Add //base dep to stubs target

The ffmpeg stubs targets uses base's logging functionality, so it
should declare a dependency on it. The gyp build does so here:

https://code.google.com/p/chromium/codesearch#chromium/src/third_party/ffmpeg/ffmpeg.gyp&l=558

Change-Id: Ie4e7fdec2f98c56af24f4848229243a64a63d347

12 days agoMerge "h264_i386: Fix operand size"
Andrew Scherkus [Thu, 15 Jan 2015 18:50:10 +0000 (10:50 -0800)]
Merge "h264_i386: Fix operand size"

13 days agoh264_i386: Fix operand size 01/73501/1
Reimar Döffinger [Wed, 3 Dec 2014 21:39:00 +0000 (22:39 +0100)]
h264_i386: Fix operand size

Fixes fate failure on macosx clang x86-64

Change-Id: Ib726b999462d826462b11b0ce3ba8efa7bc705d8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 days agoMerge "Explicitly link to libm."
Nico Weber [Wed, 14 Jan 2015 23:46:45 +0000 (15:46 -0800)]
Merge "Explicitly link to libm."

13 days agoExplicitly link to libm. 95/73495/1
Nico Weber [Wed, 14 Jan 2015 22:39:44 +0000 (14:39 -0800)]
Explicitly link to libm.

BUG=chromium:371125

3 weeks agoavformat/utils: Clear pointer in ff_alloc_extradata() to avoid leaving a stale pointe...
Michael Niedermayer [Tue, 6 Jan 2015 11:53:53 +0000 (12:53 +0100)]
avformat/utils: Clear pointer in ff_alloc_extradata() to avoid leaving a stale pointer in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavfilter/buffer: use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Tue, 6 Jan 2015 11:53:25 +0000 (12:53 +0100)]
avfilter/buffer: use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavformat/matroskadec: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Tue, 6 Jan 2015 11:48:38 +0000 (12:48 +0100)]
avformat/matroskadec: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavformat/mov: use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Tue, 6 Jan 2015 11:45:25 +0000 (12:45 +0100)]
avformat/mov: use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavformat/mov: Clear array to prevent potential out of array read from av_dlog()
Michael Niedermayer [Tue, 6 Jan 2015 04:54:29 +0000 (05:54 +0100)]
avformat/mov: Clear array to prevent potential out of array read from av_dlog()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavformat/mov: fix integer overflow in mov_read_udta_string()
Michael Niedermayer [Tue, 6 Jan 2015 03:29:10 +0000 (04:29 +0100)]
avformat/mov: fix integer overflow in mov_read_udta_string()

Found-by: Paul Mehta <paul@paulmehta.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agomov: Fix negative size calculation in mov_read_default().
Dale Curtis [Tue, 6 Jan 2015 00:34:17 +0000 (16:34 -0800)]
mov: Fix negative size calculation in mov_read_default().

The previous code assumed if an atom was marked with a 64-bit
size extension, it actually had that data available. The new
code verfies there's enough data in the atom for this to be
done.

Failure to verify causes total_size > atom.size which will
result in negative size calculations later on.

Found-by: Paul Mehta <paul@paulmehta.com>
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agomov: Fix overflow and error handling in read_tfra().
Dale Curtis [Tue, 6 Jan 2015 03:00:43 +0000 (04:00 +0100)]
mov: Fix overflow and error handling in read_tfra().

Under abnormal conditions the item_count may exceed the max
allocation size on 32-bit systems, this causes the allocated
size to overflow and become too small for the given count.

Additionally, if av_reallocp() fails its allocation, the
fragment_index_count is not correctly decremented.

Ensuring further havoc may be wrought, the error code for
read_tfra() is not checked upon return.

Found-by: Paul Mehta <paul@paulmehta.com>
positive return code and use of _array functions by commiter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 weeks agoavformat/mov: check atom nesting depth
Michael Niedermayer [Tue, 16 Dec 2014 20:14:40 +0000 (21:14 +0100)]
avformat/mov: check atom nesting depth

Fixes call stack overflow
Fixes: case1_call_stack_overflow.mp4
Found-by: Michal Zalewski <lcamtuf@coredump.cx>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 weeks agoavformat/mov: fix integer overflow of size
Michael Niedermayer [Tue, 16 Dec 2014 20:29:27 +0000 (21:29 +0100)]
avformat/mov: fix integer overflow of size

Fixes: case1_call_stack_overflow.mp4
Found-by: Michal Zalewski <lcamtuf@coredump.cx>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 weeks agoswscale: increase yuv2rgb table headroom
Michael Niedermayer [Tue, 16 Dec 2014 21:21:21 +0000 (22:21 +0100)]
swscale: increase yuv2rgb table headroom

Fixes out of array access
Fixes: case2_bad_read_yuv2rgbx32.mp4
Found-by: Michal Zalewski <lcamtuf@coredump.cx>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 weeks agoavcodec/h264: Clear delayed_pic on deallocation
Michael Niedermayer [Wed, 17 Dec 2014 20:27:37 +0000 (21:27 +0100)]
avcodec/h264: Clear delayed_pic on deallocation

Fixes use of freed memory

Fixes: case5_av_frame_copy_props.mp4
Found-by: Michal Zalewski <lcamtuf@coredump.cx>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 weeks agoavformat/aviobuf: Check that avio_seek() target is non negative 11/73311/1
Michael Niedermayer [Sun, 14 Dec 2014 16:26:11 +0000 (17:26 +0100)]
avformat/aviobuf: Check that avio_seek() target is non negative

Fixes out of array access

Suggested-by: Andrew Scherkus <scherkus@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 weeks agoMerge "Fix Windows gn build."
Dale Curtis [Wed, 17 Dec 2014 18:54:47 +0000 (10:54 -0800)]
Merge "Fix Windows gn build."

6 weeks agoconfig files for arm64 architecture 11/73211/3
Chanho Park [Sat, 6 Dec 2014 14:36:39 +0000 (23:36 +0900)]
config files for arm64 architecture

This commit adds config files for arm64 architecture.
This change was a result of below commands:

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

BUG= regression build issue
TEST= build Chromium for arm64

Change-Id: I3907ec025c236f324db72a4f8ed600d3fce0d7ad
Signed-off-by: Chanho Park <parkch98@gmail.com>
6 weeks agoFix Windows gn build. 55/73255/3
Vyacheslav Chigrin [Sat, 13 Dec 2014 17:37:47 +0000 (20:37 +0300)]
Fix Windows gn build.

Change-Id: Iccd7060944c81b8ee154692031c247741c775e65

6 weeks agoDisable FMA3 instructions on Windows x64 builds. 18/73218/2
Andrew Scherkus [Thu, 11 Dec 2014 02:55:01 +0000 (18:55 -0800)]
Disable FMA3 instructions on Windows x64 builds.

VS2013 contains a bug where FMA3 instructions will be executed on CPUs
supporting them despite them being disabled at the OS level.

BUG=440892

Change-Id: I4f4b5609173bb42ff7f1a621a7812f8aea7c8933

7 weeks agoFix gn build: Clang's -Wno* flags need to be added later 98/73198/2
Hans Wennborg [Tue, 9 Dec 2014 01:37:05 +0000 (17:37 -0800)]
Fix gn build: Clang's -Wno* flags need to be added later

BUG=431803

Change-Id: I04e42a3ca27dd1abe1e88dc8429788e93d506fbb

7 weeks agoUpdate build_ffmpeg.py instructions for MIPS target. 94/73194/1
Andrew Scherkus [Mon, 8 Dec 2014 21:46:19 +0000 (13:46 -0800)]
Update build_ffmpeg.py instructions for MIPS target.

BUG=438008

Change-Id: I55d3fb2c670a6f5a299249b69163c852247b2dc1

7 weeks agoMerge "Update config files for MIPS Linux"
Dale Curtis [Mon, 8 Dec 2014 21:00:37 +0000 (13:00 -0800)]
Merge "Update config files for MIPS Linux"

7 weeks agoMerge "Update README.chromium."
Andrew Scherkus [Mon, 8 Dec 2014 18:50:48 +0000 (10:50 -0800)]
Merge "Update README.chromium."

7 weeks agoUpdate README.chromium. 69/73169/3
Andrew Scherkus [Fri, 5 Dec 2014 02:51:17 +0000 (18:51 -0800)]
Update README.chromium.

This removes both out-of-date steps/instructions as well as replaces
the entire upstream merge instructions with a public Google Doc.

Change-Id: Id04bad0578fddcbc89058c70b7f065af826cd4d1

7 weeks agoUpdate config files for MIPS Linux 73/73173/1
Petar Jovanovic [Fri, 5 Dec 2014 13:29:10 +0000 (14:29 +0100)]
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

7 weeks agoAdd ./build.* to .gitignore. 68/73168/1
Andrew Scherkus [Fri, 5 Dec 2014 01:10:52 +0000 (17:10 -0800)]
Add ./build.* to .gitignore.

Change-Id: I034c8e67864916aa275eb08798223e145c73894d

7 weeks agoMerge branch 'merge-m41'
Andrew Scherkus [Thu, 4 Dec 2014 19:08:04 +0000 (11:08 -0800)]
Merge branch 'merge-m41'

7 weeks agoAdd script for setting up a Cygwin-friendly Visual Studio environment. 58/73158/2
Andrew Scherkus [Thu, 4 Dec 2014 04:06:38 +0000 (20:06 -0800)]
Add script for setting up a Cygwin-friendly Visual Studio environment.

It's a fancier version of the SetEnv.cmd provided by the Windows
toolchain, but also handles the cygwin-specific quirks needed when
running build_ffmpeg.sh.

Typical usage:
./win_env.sh /path/to/depot_tools x64 ./build_ffmpeg.sh win x64

BUG=438008

Change-Id: I39e49ee120023c09b9fb1edf960962688ed9dfc9

7 weeks agoUpdated configs and gypi/gni for M41 roll. 55/73155/1 merge-m41
Andrew Scherkus [Thu, 4 Dec 2014 04:01:59 +0000 (20:01 -0800)]
Updated configs and gypi/gni for M41 roll.

Changes:
  - Lots of new disabled-by-default configuration options
  - FLAC compilation units are now specific to Chromium OS

8 weeks agoMerge ffmpeg for M41.
Andrew Scherkus [Tue, 2 Dec 2014 01:33:35 +0000 (17:33 -0800)]
Merge ffmpeg for M41.

Taken from commit 24e7e0237b6eb95a649dc62bd70817a12c6c6ea6

Conflicts:
doc/t2h.pm
libavcodec/h264_cabac.c
libavcodec/utils.c

Change-Id: Ib8bad7f1ffba3c49922a8eacff158c7ae5121847

8 weeks agoavformat/crypto: Use av_memdup()
Michael Niedermayer [Tue, 2 Dec 2014 00:47:49 +0000 (01:47 +0100)]
avformat/crypto: Use av_memdup()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavformat/crypto: added encryption
Christian Suloway [Mon, 1 Dec 2014 18:55:28 +0000 (12:55 -0600)]
avformat/crypto: added encryption

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agodoc: mention the noise_bsf parameter in the docs 33/73133/1
Christophe Gisquet [Sun, 30 Nov 2014 10:59:22 +0000 (11:59 +0100)]
doc: mention the noise_bsf parameter in the docs

This looks more like a seed than an amount, as the variable name
could lead to think.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoMerge commit 'e4a77dc204f80a6876cbd91de9b71c30feebe119' 32/73132/1
Michael Niedermayer [Mon, 1 Dec 2014 20:33:07 +0000 (21:33 +0100)]
Merge commit 'e4a77dc204f80a6876cbd91de9b71c30feebe119'

* commit 'e4a77dc204f80a6876cbd91de9b71c30feebe119':
  Make the RELEASE file match with the most recent tag

Conflicts:
RELEASE

Not merged as the tag is not a FFmpeg version

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/vorbisdec: Use avpriv_float_dsp_alloc() 31/73131/1
Michael Niedermayer [Mon, 1 Dec 2014 17:10:11 +0000 (18:10 +0100)]
avcodec/vorbisdec: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/opus_celt: Use avpriv_float_dsp_alloc() 30/73130/1
Michael Niedermayer [Mon, 1 Dec 2014 17:12:38 +0000 (18:12 +0100)]
avcodec/opus_celt: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/wmaprodec: Use avpriv_float_dsp_alloc() 29/73129/1
Michael Niedermayer [Mon, 1 Dec 2014 17:07:59 +0000 (18:07 +0100)]
avcodec/wmaprodec: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavformat/utils: Search harder for missing stream information in flv by default 28/73128/1
Michael Niedermayer [Mon, 1 Dec 2014 14:26:58 +0000 (15:26 +0100)]
avformat/utils: Search harder for missing stream information in flv by default

Fixes Ticket4133

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoMake the RELEASE file match with the most recent tag 27/73127/1
Reinhard Tartler [Mon, 1 Dec 2014 03:31:31 +0000 (22:31 -0500)]
Make the RELEASE file match with the most recent tag

8 weeks agoavcodec/motion_est: use 2x8x8 for interlaced qpel 26/73126/1
Michael Niedermayer [Mon, 1 Dec 2014 12:23:24 +0000 (13:23 +0100)]
avcodec/motion_est: use 2x8x8 for interlaced qpel

Fixes out of array read
Fixes Ticket4121

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agodoc: correct license template for t2h.pm 25/73125/1
Andreas Cadhalpun [Sun, 30 Nov 2014 22:47:36 +0000 (23:47 +0100)]
doc: correct license template for t2h.pm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agodoc: fix spelling errors 24/73124/1
Andreas Cadhalpun [Sun, 30 Nov 2014 22:59:22 +0000 (23:59 +0100)]
doc: fix spelling errors

succesfully => successfully, reproducable => reproducible, specifiying => specifying, isnt => isn't, seperated => separated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavformat/mxfdec: Reset structural_components_count when allocation fails 23/73123/1
Michael Niedermayer [Sun, 30 Nov 2014 22:25:19 +0000 (23:25 +0100)]
avformat/mxfdec: Reset structural_components_count when allocation fails

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agolibavformat/mxfdec.c: initial support for EssenceGroups 22/73122/1
Mark Reid [Sun, 30 Nov 2014 20:16:27 +0000 (12:16 -0800)]
libavformat/mxfdec.c: initial support for EssenceGroups

Previous version reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoLICENSE.md: Add tests/reference.pnm 21/73121/1
Michael Niedermayer [Sun, 30 Nov 2014 18:09:45 +0000 (19:09 +0100)]
LICENSE.md: Add tests/reference.pnm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoMerge commit '8895bf7b78650c0c21c88cec0484e138ec511a4b' 20/73120/1
Michael Niedermayer [Sun, 30 Nov 2014 17:38:22 +0000 (18:38 +0100)]
Merge commit '8895bf7b78650c0c21c88cec0484e138ec511a4b'

* commit '8895bf7b78650c0c21c88cec0484e138ec511a4b':
  Replace lena.pnm

Conflicts:
tests/Makefile
tests/ref/seek/vsynth2-asv1
tests/ref/seek/vsynth2-asv2
tests/ref/seek/vsynth2-ffv1
tests/ref/seek/vsynth2-flashsv
tests/ref/seek/vsynth2-flv
tests/ref/seek/vsynth2-h261
tests/ref/seek/vsynth2-h263
tests/ref/seek/vsynth2-h263p
tests/ref/seek/vsynth2-huffyuv
tests/ref/seek/vsynth2-ljpeg
tests/ref/seek/vsynth2-mjpeg
tests/ref/seek/vsynth2-mpeg1
tests/ref/seek/vsynth2-mpeg1b
tests/ref/seek/vsynth2-mpeg2-422
tests/ref/seek/vsynth2-mpeg2-idct-int
tests/ref/seek/vsynth2-mpeg2-ilace
tests/ref/seek/vsynth2-mpeg2-ivlc-qprd
tests/ref/seek/vsynth2-mpeg2-thread
tests/ref/seek/vsynth2-mpeg2-thread-ivlc
tests/ref/seek/vsynth2-mpeg4
tests/ref/seek/vsynth2-mpeg4-adap
tests/ref/seek/vsynth2-mpeg4-error
tests/ref/seek/vsynth2-mpeg4-nr
tests/ref/seek/vsynth2-mpeg4-qpel
tests/ref/seek/vsynth2-mpeg4-qprd
tests/ref/seek/vsynth2-mpeg4-rc
tests/ref/seek/vsynth2-mpeg4-thread
tests/ref/seek/vsynth2-msmpeg4
tests/ref/seek/vsynth2-msmpeg4v2
tests/ref/seek/vsynth2-roqvideo
tests/ref/seek/vsynth2-rv10
tests/ref/seek/vsynth2-rv20
tests/ref/seek/vsynth2-svq1
tests/ref/seek/vsynth2-wmv1
tests/ref/seek/vsynth2-wmv2
tests/ref/vsynth/vsynth2-asv1
tests/ref/vsynth/vsynth2-asv2
tests/ref/vsynth/vsynth2-cljr
tests/ref/vsynth/vsynth2-dnxhd-1080i
tests/ref/vsynth/vsynth2-dnxhd-720p
tests/ref/vsynth/vsynth2-dnxhd-720p-10bit
tests/ref/vsynth/vsynth2-dnxhd-720p-rd
tests/ref/vsynth/vsynth2-dv
tests/ref/vsynth/vsynth2-dv-411
tests/ref/vsynth/vsynth2-dv-50
tests/ref/vsynth/vsynth2-ffv1
tests/ref/vsynth/vsynth2-ffvhuff
tests/ref/vsynth/vsynth2-flashsv
tests/ref/vsynth/vsynth2-flv
tests/ref/vsynth/vsynth2-h261
tests/ref/vsynth/vsynth2-h263
tests/ref/vsynth/vsynth2-h263-obmc
tests/ref/vsynth/vsynth2-h263p
tests/ref/vsynth/vsynth2-huffyuv
tests/ref/vsynth/vsynth2-jpegls
tests/ref/vsynth/vsynth2-ljpeg
tests/ref/vsynth/vsynth2-mjpeg
tests/ref/vsynth/vsynth2-mpeg1
tests/ref/vsynth/vsynth2-mpeg1b
tests/ref/vsynth/vsynth2-mpeg2
tests/ref/vsynth/vsynth2-mpeg2-422
tests/ref/vsynth/vsynth2-mpeg2-idct-int
tests/ref/vsynth/vsynth2-mpeg2-ilace
tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
tests/ref/vsynth/vsynth2-mpeg2-thread
tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc
tests/ref/vsynth/vsynth2-mpeg4
tests/ref/vsynth/vsynth2-mpeg4-adap
tests/ref/vsynth/vsynth2-mpeg4-adv
tests/ref/vsynth/vsynth2-mpeg4-error
tests/ref/vsynth/vsynth2-mpeg4-nr
tests/ref/vsynth/vsynth2-mpeg4-qpel
tests/ref/vsynth/vsynth2-mpeg4-qprd
tests/ref/vsynth/vsynth2-mpeg4-rc
tests/ref/vsynth/vsynth2-mpeg4-thread
tests/ref/vsynth/vsynth2-msmpeg4
tests/ref/vsynth/vsynth2-msmpeg4v2
tests/ref/vsynth/vsynth2-prores
tests/ref/vsynth/vsynth2-qtrle
tests/ref/vsynth/vsynth2-rgb
tests/ref/vsynth/vsynth2-roqvideo
tests/ref/vsynth/vsynth2-rv10
tests/ref/vsynth/vsynth2-rv20
tests/ref/vsynth/vsynth2-svq1
tests/ref/vsynth/vsynth2-v210
tests/ref/vsynth/vsynth2-wmv1
tests/ref/vsynth/vsynth2-wmv2
tests/ref/vsynth/vsynth2-yuv

See: c4abee734dcbdb589925dd6da98041dcf663ce49
Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoMerge commit '0f257e29c5520b215e573e7e3abde8e5a4743309' 19/73119/1
Michael Niedermayer [Sun, 30 Nov 2014 17:17:51 +0000 (18:17 +0100)]
Merge commit '0f257e29c5520b215e573e7e3abde8e5a4743309'

* commit '0f257e29c5520b215e573e7e3abde8e5a4743309':
  Treat all '*.pnm' files as non-text file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoffmpeg: take bsf arguments from the command line 18/73118/1
Christophe Gisquet [Sat, 29 Nov 2014 18:15:02 +0000 (19:15 +0100)]
ffmpeg: take bsf arguments from the command line

The format is now:
-bsf:X filter1[=opt1=str1/opt2=str2],filter2
ie the parameters are appended after the filter name using '='. As ','
has been reserved already for the list of filters, '/' is just an
example of token separation for now, but that could become part of the
API to avoid each bsf using its own tokenization.

The proper solution would be using AVOption, but this is overkill for now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/adxenc: fix rounding 17/73117/1
Michael Niedermayer [Sun, 30 Nov 2014 11:56:02 +0000 (12:56 +0100)]
avcodec/adxenc: fix rounding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/adxenc: match prediction used in the decoder 16/73116/1
Michael Niedermayer [Sun, 30 Nov 2014 11:40:03 +0000 (12:40 +0100)]
avcodec/adxenc: match prediction used in the decoder

The prediction used in the encoder was not correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/atrac3: Use avpriv_float_dsp_alloc() 15/73115/1
Michael Niedermayer [Sun, 30 Nov 2014 10:23:34 +0000 (11:23 +0100)]
avcodec/atrac3: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/libmp3lame: Use avpriv_float_dsp_alloc() 14/73114/1
Michael Niedermayer [Sun, 30 Nov 2014 10:21:50 +0000 (11:21 +0100)]
avcodec/libmp3lame: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/wma: Use avpriv_float_dsp_alloc() 13/73113/1
Michael Niedermayer [Sun, 30 Nov 2014 10:19:29 +0000 (11:19 +0100)]
avcodec/wma: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoh264_ps: move and export aspect_ratio 12/73112/1
Christophe Gisquet [Sun, 30 Nov 2014 00:45:52 +0000 (00:45 +0000)]
h264_ps: move and export aspect_ratio

Needed for filters that may need it, like an SPS bsf.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavformat/riffdec: ask for samples with wav header size < 14 11/73111/1
Michael Niedermayer [Sun, 30 Nov 2014 00:52:04 +0000 (01:52 +0100)]
avformat/riffdec: ask for samples with wav header size < 14

Based on commit by Hendrik Leppkes <h.leppkes@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavfilter/vf_yadif: fix extra leading dup frame when deint=1 10/73110/1
Neil Birkbeck [Sat, 29 Nov 2014 20:23:58 +0000 (12:23 -0800)]
avfilter/vf_yadif: fix extra leading dup frame when deint=1

Logic for handling single frame in yadif (0f9f24c9), caused deint=1 (e.g., yadif=0:-1:1) to output extra duplicate leading frame:

ffmpeg -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm  -vf yadif=0:-1:1,showinfo -f null -y /dev/null
 [Parsed_showinfo_1 @ 0x1d967d0] n:0 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:E457EEA0 plane_checksum:[E457EEA0] mean:[126] stdev:[46.6]
 [Parsed_showinfo_1 @ 0x1d967d0] n:1 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:E457EEA0 plane_checksum:[E457EEA0] mean:[126] stdev:[46.6]
(Outputs 51 frames)

After patch, vf "yadif=0:-1:1" behaves correctly (like "yadif=0:-1:0") and outputs 50 frames, first two:

[Parsed_showinfo_1 @ 0x1e307d0] n:0 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:68E8D1EB plane_checksum:[68E8D1EB] mean:[126] stdev:[46.0]
[Parsed_showinfo_1 @ 0x1e307d0] n:1 pts:2 pts_time:0.04 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:4E674BC7 plane_checksum:[4E674BC7] mean:[125] stdev:[46.0]
(Outputs 50 frames)

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/twinvq: Use avpriv_float_dsp_alloc() 09/73109/1
Michael Niedermayer [Sat, 29 Nov 2014 18:22:54 +0000 (19:22 +0100)]
avcodec/twinvq: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/ra288: Use avpriv_float_dsp_alloc() 08/73108/1
Michael Niedermayer [Sat, 29 Nov 2014 18:22:32 +0000 (19:22 +0100)]
avcodec/ra288: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/on2avc: Use avpriv_float_dsp_alloc() 07/73107/1
Michael Niedermayer [Sat, 29 Nov 2014 18:02:19 +0000 (19:02 +0100)]
avcodec/on2avc: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/aacenc: Use avpriv_float_dsp_alloc() 06/73106/1
Michael Niedermayer [Sat, 29 Nov 2014 17:58:13 +0000 (18:58 +0100)]
avcodec/aacenc: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/ac3enc: Use avpriv_float_dsp_alloc() 05/73105/1
Michael Niedermayer [Sat, 29 Nov 2014 17:54:27 +0000 (18:54 +0100)]
avcodec/ac3enc: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavutil/ppc/util_altivec: add () to VEC_SPLAT16 macro 04/73104/1
Michael Niedermayer [Sat, 29 Nov 2014 12:40:33 +0000 (13:40 +0100)]
avutil/ppc/util_altivec: add () to VEC_SPLAT16 macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavutil/buffer: Move USE_ATOMICS to thread.h to avoid it becoming out of sync with it 03/73103/1
Michael Niedermayer [Sat, 29 Nov 2014 11:06:03 +0000 (12:06 +0100)]
avutil/buffer: Move USE_ATOMICS to thread.h to avoid it becoming out of sync with it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agolibavutil/threads.h: correct an include to be local 02/73102/1
Dave Yeo [Sat, 29 Nov 2014 07:36:06 +0000 (23:36 -0800)]
libavutil/threads.h: correct an include to be local

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agolibavutil/thread.h: Support OS/2 threads 01/73101/1
Dave Yeo [Sat, 29 Nov 2014 07:34:20 +0000 (23:34 -0800)]
libavutil/thread.h: Support OS/2 threads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavutil/bprint: C++ compatible AVBPrint definition. 00/73100/1
Vadim Kalinsky [Mon, 24 Nov 2014 15:38:05 +0000 (10:38 -0500)]
avutil/bprint: C++ compatible AVBPrint definition.

Previous version reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agolavu/opt: add escaping to av_opt_serialize 99/73099/1
Lukasz Marek [Tue, 25 Nov 2014 19:25:10 +0000 (20:25 +0100)]
lavu/opt: add escaping to av_opt_serialize

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
8 weeks agoReplace lena.pnm 98/73098/1
Reinhard Tartler [Thu, 27 Nov 2014 17:21:03 +0000 (18:21 +0100)]
Replace lena.pnm

The new reference.pnm is a freely licensed replacement. The photo has
been taken by Reinhard Tartler on August 28 2014, and is licensed under
the expat license as stated at http://www.jclark.com/xml/copying.txt

8 weeks agoTreat all '*.pnm' files as non-text file 97/73097/1
Reinhard Tartler [Fri, 28 Nov 2014 14:52:50 +0000 (09:52 -0500)]
Treat all '*.pnm' files as non-text file

This convinces the pre-receive hook to not consider all *.pnm files as
text files to reduce the patch sizes and avoids triggering whitespace
checks,

Contains a correction by Janne Grunau <janne-libav@jannau.net>

8 weeks agoavfilter/vf_idet: Fixing idet for single-frame inputs. 96/73096/1
Neil Birkbeck [Fri, 28 Nov 2014 21:41:02 +0000 (13:41 -0800)]
avfilter/vf_idet: Fixing idet for single-frame inputs.

Handle single frame inputs similar to yadif (e.g., https://github.com/FFmpeg/FFmpeg/commit/0f9f24c9cfd291c7ece4d3bad64fdf06d107168a and https://github.com/FFmpeg/FFmpeg/commit/681e008d06d2241d50abe6316c908a184ddc5942)

Example:
  ffmpeg -r 1 -t 1 -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm  -vf idet,showinfo -f null -y /dev/null

Previously:
  Output file is empty, nothing was encoded (check -ss / -t / -frames parameters if used)
  [Parsed_idet_0 @ 0x36389d0] Repeated Fields: Neither:     0 Top:     0 Bottom:     0

After patch:
  [Parsed_showinfo_1 @ 0x1909810] n:0 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 ...
  [Parsed_idet_0 @ 0x18f9bb0] Repeated Fields: Neither:     1 Top:     0 Bottom:     0

Fate looks good.

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoMerge commit '491805636cef50d3f582bd345e1460eeb739ea48' 95/73095/1
Michael Niedermayer [Fri, 28 Nov 2014 21:01:38 +0000 (22:01 +0100)]
Merge commit '491805636cef50d3f582bd345e1460eeb739ea48'

* commit '491805636cef50d3f582bd345e1460eeb739ea48':
  rtmpproto: Fix a typo in a comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agofix Makefile objects for pulseaudio support 94/73094/1
Michael Stypa [Fri, 28 Nov 2014 14:54:50 +0000 (15:54 +0100)]
fix Makefile objects for pulseaudio support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agortmpproto: Fix a typo in a comment 93/73093/1
Martin Storsjö [Fri, 28 Nov 2014 17:39:38 +0000 (19:39 +0200)]
rtmpproto: Fix a typo in a comment

Signed-off-by: Martin Storsjö <martin@martin.st>
8 weeks agoavcodec/pngdec: apng: fix output buffer filling when no blending is needed. 92/73092/1
Benoit Fouet [Fri, 28 Nov 2014 15:54:09 +0000 (16:54 +0100)]
avcodec/pngdec: apng: fix output buffer filling when no blending is needed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/ppc/h264qpel_template: protect unistd.h by #if HAVE_UNISTD_H 91/73091/1
Michael Niedermayer [Fri, 28 Nov 2014 15:11:02 +0000 (16:11 +0100)]
avcodec/ppc/h264qpel_template: protect unistd.h by #if HAVE_UNISTD_H

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/pngdec: allow for some code path optimizations. 90/73090/1
Benoit Fouet [Fri, 28 Nov 2014 13:03:08 +0000 (14:03 +0100)]
avcodec/pngdec: allow for some code path optimizations.

Use 'if (CONFIG_APNG_DECODER)' where needed, so that the compiler can
optimize out some portion of code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/pngdec: do not blend on transparent black 89/73089/1
Benoit Fouet [Fri, 28 Nov 2014 09:43:01 +0000 (10:43 +0100)]
avcodec/pngdec: do not blend on transparent black

There is no need to memset the zlib output buffer, as there is no
blending happening there. Instead, do not blend when the dispose
operation is set to 'background' (tranparent black).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/ppc/h264qpel: POWER LE support for put_pixels16_l2_altivec() and avg_pixels16... 88/73088/1
Rong Yan [Fri, 28 Nov 2014 06:53:35 +0000 (06:53 +0000)]
avcodec/ppc/h264qpel: POWER LE support for put_pixels16_l2_altivec() and avg_pixels16_l2_altivec()

add put_unligned_store() and avg_unligned_store() macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/ppc/h264qpel_template: POWER LE support for PREFIX_h264_qpel16_h_lowpass_alti... 87/73087/1
Rong Yan [Fri, 28 Nov 2014 06:52:24 +0000 (06:52 +0000)]
avcodec/ppc/h264qpel_template: POWER LE support for PREFIX_h264_qpel16_h_lowpass_altivec() PREFIX_h264_qpel16_v_lowpass_altivec() PREFIX_h264_qpel16_hv_lowpass_altivec()

add load_alignment() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/ppc/h264chroma_template: POWER LE support for PREFIX_h264_chroma_mc8_altivec... 86/73086/1
Rong Yan [Fri, 28 Nov 2014 06:50:49 +0000 (06:50 +0000)]
avcodec/ppc/h264chroma_template: POWER LE support for PREFIX_h264_chroma_mc8_altivec() PREFIX_no_rnd_vc1_chroma_mc8_altivec() CHROMA_MC8_ALTIVEC_CORE_SIMPLE() CHROMA_MC8_ALTIVEC_CORE()

add marcos GET_VSRC1() GET_VSRC()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 weeks agoavcodec/ppc/h264dsp: POWER LE support for h264_idct8_add_altivec() h264_idct_dc_add_i... 85/73085/1
Rong Yan [Fri, 28 Nov 2014 06:49:50 +0000 (06:49 +0000)]
avcodec/ppc/h264dsp: POWER LE support for h264_idct8_add_altivec() h264_idct_dc_add_internal() h264_loop_filter_luma_altivec() write16x4() VEC_1D_DCT() weight_h264_W_altivec() biweight_h264_W_altivec() VEC_LOAD_U8_ADD_S16_STORE_U8() ALTIVEC_STORE_SUM_CLIP()

add marcos GET_2PERM() dstv_load() vdst_load() dest_unligned_store()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 months agoMerge commit 'fcae9f212a6001d966c52dc22cd4b22e9851b428' 84/73084/1
Michael Niedermayer [Fri, 28 Nov 2014 11:52:09 +0000 (12:52 +0100)]
Merge commit 'fcae9f212a6001d966c52dc22cd4b22e9851b428'

* commit 'fcae9f212a6001d966c52dc22cd4b22e9851b428':
  dashenc: Avoid a VLA-like construct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 months agoMerge commit 'a9d8d35e4833fc4dfbf557ce73c84e9ca6224427' 83/73083/1
Michael Niedermayer [Fri, 28 Nov 2014 11:50:38 +0000 (12:50 +0100)]
Merge commit 'a9d8d35e4833fc4dfbf557ce73c84e9ca6224427'

* commit 'a9d8d35e4833fc4dfbf557ce73c84e9ca6224427':
  dashenc: Add options to make segment names configurable

Conflicts:
libavformat/dashenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 months agoMerge commit '01eac895ab350027467ffbe7278740f89ae8be75' 82/73082/1
Michael Niedermayer [Fri, 28 Nov 2014 11:28:15 +0000 (12:28 +0100)]
Merge commit '01eac895ab350027467ffbe7278740f89ae8be75'

* commit '01eac895ab350027467ffbe7278740f89ae8be75':
  rtmpproto: Only prepend @setDataFrame for onMetaData and |RtmpSampleAccess

Conflicts:
libavformat/rtmpproto.c

See: 60fd790f381cd404ffdafa8a86a6dc93c9d80f99
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 months agoMerge commit '44127b157e9f8acb837d4bb3a094f56b40da3ef5' 81/73081/1
Michael Niedermayer [Fri, 28 Nov 2014 11:14:10 +0000 (12:14 +0100)]
Merge commit '44127b157e9f8acb837d4bb3a094f56b40da3ef5'

* commit '44127b157e9f8acb837d4bb3a094f56b40da3ef5':
  rtmppkt: Make pkt->data reallocable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 months agoMerge commit '3c3b8003a13d9c3668c0bb6d79d2376da3b2b352' 80/73080/1
Michael Niedermayer [Fri, 28 Nov 2014 10:57:33 +0000 (11:57 +0100)]
Merge commit '3c3b8003a13d9c3668c0bb6d79d2376da3b2b352'

* commit '3c3b8003a13d9c3668c0bb6d79d2376da3b2b352':
  rtmpproto: Simplify code for copying data into the output packet

Conflicts:
libavformat/rtmpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 months agoMerge commit '857e6667f9061ae261c0b951113e4efc4329b05e' 79/73079/1
Michael Niedermayer [Fri, 28 Nov 2014 10:35:08 +0000 (11:35 +0100)]
Merge commit '857e6667f9061ae261c0b951113e4efc4329b05e'

* commit '857e6667f9061ae261c0b951113e4efc4329b05e':
  rtmpproto: Clarify a comment

Conflicts:
libavformat/rtmpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2 months agodashenc: Avoid a VLA-like construct 78/73078/1
Martin Storsjö [Fri, 28 Nov 2014 09:51:05 +0000 (11:51 +0200)]
dashenc: Avoid a VLA-like construct

This fixes the build on compilers that interpreted the earlier
code as a variable length array (which we intentionally disallow).

Signed-off-by: Martin Storsjö <martin@martin.st>
2 months agodashenc: Add options to make segment names configurable 77/73077/1
Bryan Huh [Thu, 27 Nov 2014 09:46:02 +0000 (09:46 +0000)]
dashenc: Add options to make segment names configurable

This allows one to specify templated segment names for init-segments,
media-segments, and for the base-url in the case of single-file.

Signed-off-by: Martin Storsjö <martin@martin.st>
2 months agortmpproto: Only prepend @setDataFrame for onMetaData and |RtmpSampleAccess 76/73076/1
Martin Storsjö [Mon, 24 Nov 2014 08:51:46 +0000 (10:51 +0200)]
rtmpproto: Only prepend @setDataFrame for onMetaData and |RtmpSampleAccess

Currently, when streaming to an RTMP server, any time a packet of type
RTMP_PT_NOTIFY is encountered, the packet is prepended with @setDataFrame
before it gets sent to the server. This is incorrect; only packets for
onMetaData and |RtmpSampleAccess should invoke @setDataFrame on the RTMP
server. Specifically, the current bug manifests itself when trying to
stream onTextData or onCuePoint invocations.

This fix addresses that problem and ensures that the @setDataFrame is
only prepended for onMetaData and |RtmpSampleAccess.

Since data is fed to the rtmp_write function in smaller pieces (depending
on the calling IO buffer size), we can't generally assume that the
whole packet (or even the whole command string) is available at once,
therefore we can only check the command string once the full packet
has been transferred to us for sending.

Based on a patch by Jeffrey Wescott.

Signed-off-by: Martin Storsjö <martin@martin.st>