ffmpeg.git
5 years agoMerge commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab'
Michael Niedermayer [Mon, 4 Aug 2014 20:45:33 +0000 (22:45 +0200)]
Merge commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab'

* commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab':
  tiff: support reading gray+alpha at 16 bits

Conflicts:
libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e64f0bf2d2b1347ec9461f0e82852a62e8c6ffbe'
Michael Niedermayer [Mon, 4 Aug 2014 20:37:17 +0000 (22:37 +0200)]
Merge commit 'e64f0bf2d2b1347ec9461f0e82852a62e8c6ffbe'

* commit 'e64f0bf2d2b1347ec9461f0e82852a62e8c6ffbe':
  png: support reading gray+alpha at 16 bits

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2257165bff243534982f4ddabae4e65e2a35f2ab'
Michael Niedermayer [Mon, 4 Aug 2014 20:33:54 +0000 (22:33 +0200)]
Merge commit '2257165bff243534982f4ddabae4e65e2a35f2ab'

* commit '2257165bff243534982f4ddabae4e65e2a35f2ab':
  png: disable broken MMX/SIMD code for bpp <= 2

See: d1c48025a71e9e190d79115759c10f5807f4d0a7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820'
Michael Niedermayer [Mon, 4 Aug 2014 20:26:13 +0000 (22:26 +0200)]
Merge commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820'

* commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820':
  swscale: support AV_PIX_FMT_YA16 as input

Conflicts:
libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6'
Michael Niedermayer [Mon, 4 Aug 2014 20:12:24 +0000 (22:12 +0200)]
Merge commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6'

* commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6':
  avutil: add AV_PIX_FMT_YA16 pixel format

Conflicts:
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5'
Michael Niedermayer [Mon, 4 Aug 2014 19:48:00 +0000 (21:48 +0200)]
Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5'

* commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5':
  avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8

Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/raw.c
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e0d73fda361729d207e51fa2afd8ba6102e58d98'
Michael Niedermayer [Mon, 4 Aug 2014 19:33:07 +0000 (21:33 +0200)]
Merge commit 'e0d73fda361729d207e51fa2afd8ba6102e58d98'

* commit 'e0d73fda361729d207e51fa2afd8ba6102e58d98':
  avutil: add alias names for gray 8/16 colour spaces

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26'
Michael Niedermayer [Mon, 4 Aug 2014 19:24:24 +0000 (21:24 +0200)]
Merge commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26'

* commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26':
  pixdesc: Support pixelformat aliases

Conflicts:
doc/APIchanges
libavutil/pixdesc.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5420099cab1e915b191cceccec4364f54cec6e52'
Michael Niedermayer [Mon, 4 Aug 2014 19:18:13 +0000 (21:18 +0200)]
Merge commit '5420099cab1e915b191cceccec4364f54cec6e52'

* commit '5420099cab1e915b191cceccec4364f54cec6e52':
  swscale: correctly pad destination buffer in rgb conversion

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/util: change av_find_default_stream_index() to use a score based system
Michael Niedermayer [Fri, 1 Aug 2014 20:17:52 +0000 (22:17 +0200)]
avformat/util: change av_find_default_stream_index() to use a score based system

Disfavor video streams with unknown resolution and no packets
Fixes seeking in audio-only-speex.flv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: hevc_deblock: remove unnecessary masking
Christophe Gisquet [Wed, 23 Jul 2014 21:21:20 +0000 (23:21 +0200)]
x86: hevc_deblock: remove unnecessary masking

The unpacks/shuffles later on makes it unnecessary.

Before:
1508 decicycles in h, 2096759 runs, 393 skips
2512 decicycles in v, 2095422 runs, 1730 skips

After:
1477 decicycles in h, 2096745 runs, 407 skips
2484 decicycles in v, 2095297 runs, 1855 skips

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/hevc_mc: use fewer instructions in hevc_put_hevc_{uni, bi}_w[24]_{8, 10, 12}
James Almer [Mon, 4 Aug 2014 04:18:46 +0000 (01:18 -0300)]
x86/hevc_mc: use fewer instructions in hevc_put_hevc_{uni, bi}_w[24]_{8, 10, 12}

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/hevc_mc: remove an unnecessary pxor
James Almer [Mon, 4 Aug 2014 02:53:38 +0000 (23:53 -0300)]
x86/hevc_mc: remove an unnecessary pxor

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac'
Michael Niedermayer [Mon, 4 Aug 2014 12:23:46 +0000 (14:23 +0200)]
Merge commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac'

* commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac':
  fate: explicitly set the default THREADS value

Conflicts:
tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc'
Michael Niedermayer [Mon, 4 Aug 2014 12:13:45 +0000 (14:13 +0200)]
Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc'

* commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc':
  Add Icecast protocol

Conflicts:
Changelog
configure
doc/protocols.texi
libavformat/icecast.c
libavformat/version.h

See: e3dc2c86fc4178b100484c54f12c88705cdf6724
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotiff: support reading gray+alpha at 16 bits
Vittorio Giovara [Sun, 20 Jul 2014 21:54:35 +0000 (22:54 +0100)]
tiff: support reading gray+alpha at 16 bits

5 years agopng: support reading gray+alpha at 16 bits
Vittorio Giovara [Sun, 20 Jul 2014 21:54:27 +0000 (22:54 +0100)]
png: support reading gray+alpha at 16 bits

5 years agopng: disable broken MMX/SIMD code for bpp <= 2
Vittorio Giovara [Fri, 1 Aug 2014 18:13:55 +0000 (19:13 +0100)]
png: disable broken MMX/SIMD code for bpp <= 2

The decoder was producing different results when ASM was disabled.
Based on a long debug session with Kostya.

5 years agoswscale: support AV_PIX_FMT_YA16 as input
Vittorio Giovara [Sun, 20 Jul 2014 05:05:35 +0000 (01:05 -0400)]
swscale: support AV_PIX_FMT_YA16 as input

Based on a long debug session with Kostya.

5 years agoavutil: add AV_PIX_FMT_YA16 pixel format
Vittorio Giovara [Tue, 29 Jul 2014 13:06:22 +0000 (14:06 +0100)]
avutil: add AV_PIX_FMT_YA16 pixel format

5 years agoavutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8
Vittorio Giovara [Tue, 29 Jul 2014 13:02:09 +0000 (14:02 +0100)]
avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8

The rationale is that you have a packed format in form
<greyscale sample> <alpha sample> <greyscale sample> <alpha sample>
and shortening greyscale to 'G' might make one thing about Greenscale instead.
An alias pixel format and color space name are provided for compatibility.

5 years agoavutil: add alias names for gray 8/16 colour spaces
Vittorio Giovara [Wed, 23 Jul 2014 20:05:31 +0000 (21:05 +0100)]
avutil: add alias names for gray 8/16 colour spaces

5 years agopixdesc: Support pixelformat aliases
Luca Barbato [Thu, 24 Jul 2014 21:17:17 +0000 (23:17 +0200)]
pixdesc: Support pixelformat aliases

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoswscale: correctly pad destination buffer in rgb conversion
Kostya Shishkov [Sun, 3 Aug 2014 09:28:49 +0000 (10:28 +0100)]
swscale: correctly pad destination buffer in rgb conversion

Bug-Id: 772
CC: libav-stable@libav.org
Found-By: Justin Ruggles <justin.ruggles@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agolibavformat: Add Icecast protocol
ePirat [Mon, 28 Jul 2014 08:36:19 +0000 (10:36 +0200)]
libavformat: Add Icecast protocol

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: Do not fail if a demuxer and decoder use the same option identifer
Michael Niedermayer [Mon, 4 Aug 2014 11:32:11 +0000 (13:32 +0200)]
ffmpeg: Do not fail if a demuxer and decoder use the same option identifer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bb41115d56930b9f5d59e79dca254d1201246967'
Michael Niedermayer [Mon, 4 Aug 2014 10:41:15 +0000 (12:41 +0200)]
Merge commit 'bb41115d56930b9f5d59e79dca254d1201246967'

* commit 'bb41115d56930b9f5d59e79dca254d1201246967':
  imgutils: Do not declare avpriv_set_systematic_pal2 in the public header

Conflicts:
libavutil/internal.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: explicitly set the default THREADS value
Janne Grunau [Mon, 4 Aug 2014 08:04:08 +0000 (10:04 +0200)]
fate: explicitly set the default THREADS value

This makes the default of '1' more explicit than defaulting to '1' in
fate-run.sh and regression-funcs.sh if THREADS is not set.
Fixes the reported thread count in fate-cpu if THREADS is not set.

5 years agoAdd Icecast protocol
Marvin Scholz [Mon, 28 Jul 2014 09:55:38 +0000 (11:55 +0200)]
Add Icecast protocol

Icecast is basically a convenience wrapper around the HTTP protocol.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoimgutils: Do not declare avpriv_set_systematic_pal2 in the public header
Diego Biurrun [Sun, 3 Aug 2014 18:06:06 +0000 (11:06 -0700)]
imgutils: Do not declare avpriv_set_systematic_pal2 in the public header

5 years agoMerge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a'
Michael Niedermayer [Mon, 4 Aug 2014 03:44:00 +0000 (05:44 +0200)]
Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a'

* commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a':
  avcodec: Deprecate dtg_active_format field in favor of avframe side-data

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/mpeg12dec.c
libavcodec/version.h
libavfilter/vf_showinfo.c
libavutil/frame.h
libavutil/version.h

See: 2a3c36e920d958e99fb4edf065a6713c30f2c2a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoDeprecate AFD field and add AFD as side-data
Kieran Kunhya [Sun, 3 Aug 2014 18:24:56 +0000 (19:24 +0100)]
Deprecate AFD field and add AFD as side-data

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd0393d79bc3d61c9f2ff832c0e273b7774ff0269'
Michael Niedermayer [Mon, 4 Aug 2014 03:08:01 +0000 (05:08 +0200)]
Merge commit 'd0393d79bc3d61c9f2ff832c0e273b7774ff0269'

* commit 'd0393d79bc3d61c9f2ff832c0e273b7774ff0269':
  huffyuv: Check and propagate function return values

Conflicts:
libavcodec/huffyuvdec.c

See: f67a0d115254461649470452058fa3c28c0df294
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6234058148d6e1ee765913b678a22385a87bffac'
Michael Niedermayer [Mon, 4 Aug 2014 02:57:50 +0000 (04:57 +0200)]
Merge commit '6234058148d6e1ee765913b678a22385a87bffac'

* commit '6234058148d6e1ee765913b678a22385a87bffac':
  huffyuv: Return proper error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3160bdc7f7bc27bb67561270b4e730cd2d844afd'
Michael Niedermayer [Mon, 4 Aug 2014 02:53:23 +0000 (04:53 +0200)]
Merge commit '3160bdc7f7bc27bb67561270b4e730cd2d844afd'

* commit '3160bdc7f7bc27bb67561270b4e730cd2d844afd':
  huffyuv: Use avpriv_report_missing_feature() where appropriate

Conflicts:
libavcodec/huffyuvdec.c

Not merged, the error messages are not about missing support of features
of the input file. avpriv_report_missing_feature() speaks about
"... your file has a feature which has not been implemented"
Thats would simply not be correct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b7616f5716dce68c749d5dfeab19cf595a11807c'
Michael Niedermayer [Mon, 4 Aug 2014 02:42:04 +0000 (04:42 +0200)]
Merge commit 'b7616f5716dce68c749d5dfeab19cf595a11807c'

* commit 'b7616f5716dce68c749d5dfeab19cf595a11807c':
  huffyuv: Eliminate some pointless casts

Conflicts:
libavcodec/huffyuvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c065f4a0c652cc569c927c95148111b3aa2962dc'
Michael Niedermayer [Mon, 4 Aug 2014 02:34:17 +0000 (04:34 +0200)]
Merge commit 'c065f4a0c652cc569c927c95148111b3aa2962dc'

* commit 'c065f4a0c652cc569c927c95148111b3aa2962dc':
  huffyuv: K&R formatting cosmetics

Conflicts:
libavcodec/huffyuvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f89d76c10355242c39b08f253c1d1524f45ef778'
Michael Niedermayer [Mon, 4 Aug 2014 02:14:43 +0000 (04:14 +0200)]
Merge commit 'f89d76c10355242c39b08f253c1d1524f45ef778'

* commit 'f89d76c10355242c39b08f253c1d1524f45ef778':
  mpeg4video: Initialize xvididct for all threads

Conflicts:
libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a238b83b13640e3192d7d4aaad2242f13a9a84a1'
Michael Niedermayer [Mon, 4 Aug 2014 02:06:30 +0000 (04:06 +0200)]
Merge commit 'a238b83b13640e3192d7d4aaad2242f13a9a84a1'

* commit 'a238b83b13640e3192d7d4aaad2242f13a9a84a1':
  aarch64: use MACH-O const data asm directive in const macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ac6b95dbc0b53b3ea461bd5e5e7f7f31d2983733'
Michael Niedermayer [Mon, 4 Aug 2014 02:06:06 +0000 (04:06 +0200)]
Merge commit 'ac6b95dbc0b53b3ea461bd5e5e7f7f31d2983733'

* commit 'ac6b95dbc0b53b3ea461bd5e5e7f7f31d2983733':
  aarch64: add ',' between assembler macro arguments where missing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'caf5ef852bf71984d3322bbeaf48cfb04ac8255f'
Michael Niedermayer [Mon, 4 Aug 2014 02:05:25 +0000 (04:05 +0200)]
Merge commit 'caf5ef852bf71984d3322bbeaf48cfb04ac8255f'

* commit 'caf5ef852bf71984d3322bbeaf48cfb04ac8255f':
  cpu-test: test av_cpu_count

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '07d8fa58121be8fe315bd51ab760547fe209a745'
Michael Niedermayer [Mon, 4 Aug 2014 01:51:17 +0000 (03:51 +0200)]
Merge commit '07d8fa58121be8fe315bd51ab760547fe209a745'

* commit '07d8fa58121be8fe315bd51ab760547fe209a745':
  fate: add informative cpu test

Conflicts:
tests/fate/libavutil.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc'
Michael Niedermayer [Mon, 4 Aug 2014 01:39:39 +0000 (03:39 +0200)]
Merge commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc'

* commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc':
  http: Refactor http_open_cnx

See: c2a170ac0ddd53516d004cd2bf55ceaffa59642a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/http: fix tls/tcp protocol after a 302 move in https
Rodger Combs [Sat, 2 Aug 2014 00:37:27 +0000 (20:37 -0400)]
avformat/http: fix tls/tcp protocol after a 302 move in https

Fixes ticket 3824

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswresample/swresample: Treat mono as planar
Michael Niedermayer [Mon, 4 Aug 2014 01:05:05 +0000 (03:05 +0200)]
swresample/swresample: Treat mono as planar

This might in some cases improve performance.

Idea from: fbc0b8659967ea54a8472b5f795270d38bb085dd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'
Michael Niedermayer [Mon, 4 Aug 2014 00:49:43 +0000 (02:49 +0200)]
Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'

* commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd':
  lavr: Do not change the sample format for mono audio

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/mem: document NULL related saftey of av_freep()
Michael Niedermayer [Mon, 4 Aug 2014 00:34:54 +0000 (02:34 +0200)]
avutil/mem: document NULL related saftey of av_freep()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: Deprecate dtg_active_format field in favor of avframe side-data
Kieran Kunhya [Sun, 3 Aug 2014 18:24:56 +0000 (19:24 +0100)]
avcodec: Deprecate dtg_active_format field in favor of avframe side-data

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agohuffyuv: Check and propagate function return values
Diego Biurrun [Sun, 3 Aug 2014 19:19:10 +0000 (12:19 -0700)]
huffyuv: Check and propagate function return values

Bug-Id: CVE-2013-0868

inspired by a patch from Michael Niedermayer <michaelni@gmx.at>
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Diego Biurrun <diego@biurrun.de>
CC: libav-stable@libav.org
5 years agohuffyuv: Return proper error codes
Diego Biurrun [Sun, 3 Aug 2014 18:22:20 +0000 (11:22 -0700)]
huffyuv: Return proper error codes

5 years agohuffyuv: Use avpriv_report_missing_feature() where appropriate
Diego Biurrun [Sun, 3 Aug 2014 18:02:22 +0000 (11:02 -0700)]
huffyuv: Use avpriv_report_missing_feature() where appropriate

5 years agohuffyuv: Eliminate some pointless casts
Diego Biurrun [Sun, 3 Aug 2014 17:57:01 +0000 (10:57 -0700)]
huffyuv: Eliminate some pointless casts

5 years agohuffyuv: K&R formatting cosmetics
Diego Biurrun [Sun, 3 Aug 2014 17:49:40 +0000 (10:49 -0700)]
huffyuv: K&R formatting cosmetics

5 years agompeg4video: Initialize xvididct for all threads
Anton Khirnov [Sun, 3 Aug 2014 11:59:03 +0000 (04:59 -0700)]
mpeg4video: Initialize xvididct for all threads

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoaarch64: use MACH-O const data asm directive in const macro
Janne Grunau [Wed, 23 Jul 2014 08:06:15 +0000 (10:06 +0200)]
aarch64: use MACH-O const data asm directive in const macro

5 years agoaarch64: add ',' between assembler macro arguments where missing
Janne Grunau [Thu, 24 Jul 2014 12:50:46 +0000 (14:50 +0200)]
aarch64: add ',' between assembler macro arguments where missing

llvm's integrated assembler does not accept spaces as macro argument
delimiter when targeting darwin. Using a explicit delimiter is a good
idea in principle since it makes case like 'macro 4 -2' vs 'macro 4 - 2'
clear.

5 years agocpu-test: test av_cpu_count
Janne Grunau [Sun, 3 Aug 2014 11:03:13 +0000 (13:03 +0200)]
cpu-test: test av_cpu_count

Add CPU count and number threads as informative values for fate.

5 years agofate: add informative cpu test
Janne Grunau [Thu, 30 Jan 2014 12:48:35 +0000 (13:48 +0100)]
fate: add informative cpu test

libavutil/cpu-test prints raw and effective cpu flags to STDERR. Detected
cpu flags can be useful for debugging fate errors.

No comparison of the result against a expected result since that would
require fate config specific references.

5 years agoavfilter/vf_spp: Use dct->get_pixels()
Michael Niedermayer [Sun, 3 Aug 2014 21:36:01 +0000 (23:36 +0200)]
avfilter/vf_spp: Use dct->get_pixels()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/avdct: Add get_pixels()
Michael Niedermayer [Sat, 2 Aug 2014 18:59:24 +0000 (20:59 +0200)]
avcodec/avdct: Add get_pixels()

Suggested-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohttp: Refactor http_open_cnx
Luca Barbato [Sat, 2 Aug 2014 11:29:02 +0000 (13:29 +0200)]
http: Refactor http_open_cnx

Split return value handling from the actual opening.

Incidentally fixes the https -> http redirect issue reported by
Compn on behalf of rcombs.

CC: libav-stable@libav.org
5 years agolavr: Do not change the sample format for mono audio
Justin Ruggles [Fri, 18 Jul 2014 21:39:01 +0000 (17:39 -0400)]
lavr: Do not change the sample format for mono audio

This treats mono as planar internally within libavresample rather
than changing the sample format.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoMerge commit '9f17685dfb70a73823aca16ad246ee3b831d1de8'
Michael Niedermayer [Sun, 3 Aug 2014 18:53:00 +0000 (20:53 +0200)]
Merge commit '9f17685dfb70a73823aca16ad246ee3b831d1de8'

* commit '9f17685dfb70a73823aca16ad246ee3b831d1de8':
  avcodec: Deprecate unused defines and options

Conflicts:
doc/APIchanges
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bad81800bb51f43d28d656abf5d45b477e3b3198'
Michael Niedermayer [Sun, 3 Aug 2014 17:45:25 +0000 (19:45 +0200)]
Merge commit 'bad81800bb51f43d28d656abf5d45b477e3b3198'

* commit 'bad81800bb51f43d28d656abf5d45b477e3b3198':
  avcodec: options: Add missing deprecation ifdefs around emu_edge

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '072916d903d3a925bcd0c864f12254157cab63c1'
Michael Niedermayer [Sun, 3 Aug 2014 17:35:08 +0000 (19:35 +0200)]
Merge commit '072916d903d3a925bcd0c864f12254157cab63c1'

* commit '072916d903d3a925bcd0c864f12254157cab63c1':
  filtfmts: Replace deprecated uses of AVFilterPad

Conflicts:
libavfilter/filtfmts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6a928293dd29c7f0dcf09107980a1d651c9957df'
Michael Niedermayer [Sun, 3 Aug 2014 17:18:13 +0000 (19:18 +0200)]
Merge commit '6a928293dd29c7f0dcf09107980a1d651c9957df'

* commit '6a928293dd29c7f0dcf09107980a1d651c9957df':
  examples: filter_audio: Add missing mem.h header for av_freep()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c6a1ac2dd9808a4753dd005ab5747dda68ab454f'
Michael Niedermayer [Sun, 3 Aug 2014 17:06:39 +0000 (19:06 +0200)]
Merge commit 'c6a1ac2dd9808a4753dd005ab5747dda68ab454f'

* commit 'c6a1ac2dd9808a4753dd005ab5747dda68ab454f':
  vf_fps: Replace use of deprecated AVFilterBufferRef by AVFrame

See: a05a44e205d6ae13d5eb1cd8d4ad2dba6ec940b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c697c590fbf296b1679b80c8f4071e4c8a6c884b'
Michael Niedermayer [Sun, 3 Aug 2014 16:58:19 +0000 (18:58 +0200)]
Merge commit 'c697c590fbf296b1679b80c8f4071e4c8a6c884b'

* commit 'c697c590fbf296b1679b80c8f4071e4c8a6c884b':
  lcl: Disentangle pointers to input data and decompression buffer

Conflicts:
libavcodec/lcldec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'df507d5aa063c2ce31fac9f76c6f3bbe9a20c445'
Michael Niedermayer [Sun, 3 Aug 2014 16:35:47 +0000 (18:35 +0200)]
Merge commit 'df507d5aa063c2ce31fac9f76c6f3bbe9a20c445'

* commit 'df507d5aa063c2ce31fac9f76c6f3bbe9a20c445':
  tiff: Replace deprecated PIX_FMT names by modern ones

Conflicts:
libavcodec/tiff.c

See: ac627b3d38d370027406c93c2dcaac0b1712a7d4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300'
Michael Niedermayer [Sun, 3 Aug 2014 16:29:38 +0000 (18:29 +0200)]
Merge commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300'

* commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300':
  dv: Update DV-profile-related functions to current public API

Conflicts:
libavcodec/dvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegtsenc: do not flush after everything
Michael Niedermayer [Sun, 3 Aug 2014 15:46:06 +0000 (17:46 +0200)]
avformat/mpegtsenc: do not flush after everything

there is flushing code in the avformat core that does this in a more
controlled way.

Fixes ticket2748

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mux: flush after header writing, like after packets
Michael Niedermayer [Sun, 3 Aug 2014 15:44:56 +0000 (17:44 +0200)]
avformat/mux: flush after header writing, like after packets

This makes problematic unconditional flushes in mpegts redundant
And is thus part of a fix for ticket 2748

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pnm: check buf[0] before using buf[1]
Michael Niedermayer [Sun, 3 Aug 2014 12:01:03 +0000 (14:01 +0200)]
avcodec/pnm: check buf[0] before using buf[1]

Fixes CSA warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: Deprecate unused defines and options
Diego Biurrun [Fri, 25 Jul 2014 23:00:33 +0000 (16:00 -0700)]
avcodec: Deprecate unused defines and options

5 years agoavcodec: options: Add missing deprecation ifdefs around emu_edge
Diego Biurrun [Sat, 2 Aug 2014 19:37:49 +0000 (12:37 -0700)]
avcodec: options: Add missing deprecation ifdefs around emu_edge

5 years agofiltfmts: Replace deprecated uses of AVFilterPad
Diego Biurrun [Sat, 2 Aug 2014 19:51:48 +0000 (12:51 -0700)]
filtfmts: Replace deprecated uses of AVFilterPad

Also add missing mem.h header for av_freep().

5 years agoavcodec/takdec: remove unused variable
Michael Niedermayer [Sat, 2 Aug 2014 19:22:56 +0000 (21:22 +0200)]
avcodec/takdec: remove unused variable

Found-by: CSA
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/takdec: move tmp declaration to where its used
Michael Niedermayer [Sat, 2 Aug 2014 19:20:04 +0000 (21:20 +0200)]
avcodec/takdec: move tmp declaration to where its used

Makes the code a bit easier to read

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/ffserver: merge paragraph starting with "What happens next?" with previous one
Stefano Sabatini [Sat, 2 Aug 2014 14:33:16 +0000 (16:33 +0200)]
doc/ffserver: merge paragraph starting with "What happens next?" with previous one

The name of the paragraph sounded a bit silly, and its text is small so
it's better to merge it with the previous paragraph.

5 years agoexamples: filter_audio: Add missing mem.h header for av_freep()
Diego Biurrun [Sat, 2 Aug 2014 19:39:22 +0000 (12:39 -0700)]
examples: filter_audio: Add missing mem.h header for av_freep()

5 years agovf_fps: Replace use of deprecated AVFilterBufferRef by AVFrame
Diego Biurrun [Sat, 2 Aug 2014 19:30:11 +0000 (12:30 -0700)]
vf_fps: Replace use of deprecated AVFilterBufferRef by AVFrame

5 years agolcl: Disentangle pointers to input data and decompression buffer
Diego Biurrun [Sat, 2 Aug 2014 13:14:55 +0000 (06:14 -0700)]
lcl: Disentangle pointers to input data and decompression buffer

This is cleaner and avoids a cast plus a related const qualifier warning.

5 years agox86/hevc_deblock: improve 8bit transpose store macros
James Almer [Sun, 3 Aug 2014 02:21:31 +0000 (23:21 -0300)]
x86/hevc_deblock: improve 8bit transpose store macros

Up to four instructions less depending on function and instruction set.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/tee: flip assigment direction
Michael Niedermayer [Sat, 2 Aug 2014 20:30:03 +0000 (22:30 +0200)]
avformat/tee: flip assigment direction

Found-by: CSA
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg12dec: fix vissible typo after 17c65651
Clément Bœsch [Sat, 2 Aug 2014 22:02:23 +0000 (00:02 +0200)]
avcodec/mpeg12dec: fix vissible typo after 17c65651

5 years agoavcodec/mpeg12dec: Document Ticket3809 fix
Michael Niedermayer [Sat, 2 Aug 2014 20:57:34 +0000 (22:57 +0200)]
avcodec/mpeg12dec: Document Ticket3809 fix

Suggested-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/error_resilience: make error an local variable where possible
Michael Niedermayer [Sat, 2 Aug 2014 20:04:08 +0000 (22:04 +0200)]
avcodec/error_resilience: make error an local variable where possible

This makes the code easier to understand as the scope of the variable is
smaller.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/error_resilience: comment out unused assignment
Michael Niedermayer [Sat, 2 Aug 2014 20:01:59 +0000 (22:01 +0200)]
avcodec/error_resilience: comment out unused  assignment

Its not removed as the code which uses this is out-commented too.

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotiff: Replace deprecated PIX_FMT names by modern ones
Diego Biurrun [Sat, 2 Aug 2014 15:47:46 +0000 (08:47 -0700)]
tiff: Replace deprecated PIX_FMT names by modern ones

5 years agodv: Update DV-profile-related functions to current public API
Diego Biurrun [Sat, 2 Aug 2014 15:45:01 +0000 (08:45 -0700)]
dv: Update DV-profile-related functions to current public API

5 years agoavcodec/mmvideo: remove unused return value and assignment
Michael Niedermayer [Sat, 2 Aug 2014 19:46:24 +0000 (21:46 +0200)]
avcodec/mmvideo: remove unused return value and assignment

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/avuienc: move pointer declaration to where its used
Michael Niedermayer [Sat, 2 Aug 2014 18:13:08 +0000 (20:13 +0200)]
avcodec/avuienc: move pointer declaration to where its used

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/lavfutils: remove redundant variable init
Michael Niedermayer [Sat, 2 Aug 2014 18:03:10 +0000 (20:03 +0200)]
avfilter/lavfutils: remove redundant variable init

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8'
Michael Niedermayer [Sat, 2 Aug 2014 17:40:18 +0000 (19:40 +0200)]
Merge commit 'ffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8'

* commit 'ffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8':
  ppc: fft: Build AltiVec optimizations in the standard way

Conflicts:
libavcodec/ppc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffserver: initialize pbuffer in prepare_sdp_description()
Michael Niedermayer [Sat, 2 Aug 2014 12:03:30 +0000 (14:03 +0200)]
ffserver: initialize pbuffer in prepare_sdp_description()

also check pbuffer before use

Found-by: CSA
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/wavpackenc: Fix log2sample() result value
Michael Niedermayer [Sat, 2 Aug 2014 16:15:12 +0000 (18:15 +0200)]
avcodec/wavpackenc: Fix log2sample() result value

Found-by: CSA
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/dtsdec: skip the first 4k in dts_probe()
Michael Niedermayer [Sat, 2 Aug 2014 15:25:04 +0000 (17:25 +0200)]
avformat/dtsdec: skip the first 4k in dts_probe()

DTS primarly needs to be separated from PCM, and PCM can contain cliping and
overshoots at the very start which can mimic DTS headers.

If this isnt sufficient then more of the DTS stream has to be decoded
and analyzed

Fixes ticket3784

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/dtsdec: fix signedness in reference pcm highpass in dts_probe()
Michael Niedermayer [Sat, 2 Aug 2014 15:23:03 +0000 (17:23 +0200)]
avformat/dtsdec: fix signedness in reference pcm highpass in dts_probe()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/dtsdec: count LE and BE separately in dts_probe()
Michael Niedermayer [Sat, 2 Aug 2014 15:21:03 +0000 (17:21 +0200)]
avformat/dtsdec: count LE and BE separately in dts_probe()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoppc: fft: Build AltiVec optimizations in the standard way
Diego Biurrun [Thu, 31 Jul 2014 11:46:50 +0000 (04:46 -0700)]
ppc: fft: Build AltiVec optimizations in the standard way