ffmpeg.git
5 years agoMerge commit '849b9d34c7ef70b370c53e7af3940f51cbc07d0f'
Michael Niedermayer [Tue, 5 Aug 2014 17:40:23 +0000 (19:40 +0200)]
Merge commit '849b9d34c7ef70b370c53e7af3940f51cbc07d0f'

* commit '849b9d34c7ef70b370c53e7af3940f51cbc07d0f':
  wmalosslessdec: fix mclms_coeffs* array size

See: ec9578d54d09b64bf112c2bf7a34b1ef3b93dbd3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead'
Michael Niedermayer [Tue, 5 Aug 2014 17:31:08 +0000 (19:31 +0200)]
Merge commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead'

* commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead':
  configure: check $as first before using $gas as GNU as

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd395895cdb2ac8c95bd488549e7f893bd4dcc248'
Michael Niedermayer [Tue, 5 Aug 2014 17:10:05 +0000 (19:10 +0200)]
Merge commit 'd395895cdb2ac8c95bd488549e7f893bd4dcc248'

* commit 'd395895cdb2ac8c95bd488549e7f893bd4dcc248':
  fate: generate tests/pixfmts.mak for all targets requiring it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/iff: Fix "source comment"
Michael Niedermayer [Tue, 5 Aug 2014 16:16:46 +0000 (18:16 +0200)]
avformat/iff: Fix "source comment"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_noise: make constant things const
Michael Niedermayer [Tue, 5 Aug 2014 14:31:21 +0000 (16:31 +0200)]
avfilter/vf_noise: make constant things const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agowmalosslessdec: fix mclms_coeffs* array size
Michael Niedermayer [Fri, 7 Feb 2014 14:07:23 +0000 (15:07 +0100)]
wmalosslessdec: fix mclms_coeffs* array size

Fixes corruption of context

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Bug-Id: CVE-2014-2098
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavfilter/avf_showwaves: New p2p mode for showwaves filter
mrskman [Mon, 4 Aug 2014 09:40:47 +0000 (11:40 +0200)]
avfilter/avf_showwaves: New p2p mode for showwaves filter

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c'
Michael Niedermayer [Tue, 5 Aug 2014 11:58:10 +0000 (13:58 +0200)]
Merge commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c'

* commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c':
  movenc: Add option to disable nero chapters

Conflicts:
doc/muxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2601a9447efb778930b01ac58d2cc1d02498db4e'
Michael Niedermayer [Tue, 5 Aug 2014 11:52:32 +0000 (13:52 +0200)]
Merge commit '2601a9447efb778930b01ac58d2cc1d02498db4e'

* commit '2601a9447efb778930b01ac58d2cc1d02498db4e':
  mpegts: Add HEVC definitions

Conflicts:
libavformat/mpegts.h

See: b2880a3de9e3e160c47c069abcc8cb60015407b6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '89616408e38ac7257e36976723df0e23d6ee1157'
Michael Niedermayer [Tue, 5 Aug 2014 11:45:07 +0000 (13:45 +0200)]
Merge commit '89616408e38ac7257e36976723df0e23d6ee1157'

* commit '89616408e38ac7257e36976723df0e23d6ee1157':
  mpegts: Define the section length with a constant

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '701e8b42e12ad625c64ceae2252acb1de390278c'
Michael Niedermayer [Tue, 5 Aug 2014 11:22:34 +0000 (13:22 +0200)]
Merge commit '701e8b42e12ad625c64ceae2252acb1de390278c'

* commit '701e8b42e12ad625c64ceae2252acb1de390278c':
  vc-1: Optimise parser (with special attention to ARM)

Conflicts:
libavcodec/vc1_parser.c

See: a0d7f9ec9a10d935b83a47dbcb2cd85dcc007738
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: check $as first before using $gas as GNU as
Janne Grunau [Tue, 5 Aug 2014 10:08:09 +0000 (12:08 +0200)]
configure: check $as first before using $gas as GNU as

llvm's integrated assembler supports the AArch64 asm on darwin since
August 2014. So check $as first before using gas-preprocessor.pl via
$gas. Makes the checks specific for that the architecture specific asm
needs. PPC Altivec and AArch64 needs on ':vararg' for macro arguments.
Arm needs in addition the '.altmacro' directive.

5 years agoMerge commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed'
Michael Niedermayer [Tue, 5 Aug 2014 10:59:02 +0000 (12:59 +0200)]
Merge commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed'

* commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed':
  vc-1: Add platform-specific start code search routine to VC1DSPContext.

Conflicts:
configure
libavcodec/arm/vc1dsp_init_arm.c
libavcodec/vc1dsp.c
libavcodec/vc1dsp.h

See: 9d8ecdd8ca6d248e7439e8fdf255e39eda14e0f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8'
Michael Niedermayer [Tue, 5 Aug 2014 10:45:30 +0000 (12:45 +0200)]
Merge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8'

* commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8':
  h264: Move start code search functions into separate source files.

Conflicts:
libavcodec/arm/Makefile
libavcodec/arm/h264dsp_init_arm.c
libavcodec/h264_parser.c
libavcodec/h264dsp.c
libavcodec/startcode.c
libavcodec/startcode.h

See: 270cede3f3772117454a14b620803d731036942d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: generate tests/pixfmts.mak for all targets requiring it
Janne Grunau [Tue, 5 Aug 2014 07:39:00 +0000 (09:39 +0200)]
fate: generate tests/pixfmts.mak for all targets requiring it

All subtargets which should run the fate-filter-pixdesc% need to
generate and include tests/pixfmts.mak. Most noteable missing target was
fate itself.

5 years agomovenc: Add option to disable nero chapters
John Stebbins [Mon, 4 Aug 2014 20:13:44 +0000 (13:13 -0700)]
movenc: Add option to disable nero chapters

And add flag to muxer documentation.
Nero chapters break some taggers (mp3tag and iTunes).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agompegts: Add HEVC definitions
Femi Adeyemi-Ejeye [Wed, 30 Apr 2014 15:58:09 +0000 (16:58 +0100)]
mpegts: Add HEVC definitions

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agox86/vp9lpf: use fewer instructions in SPLATB_MIX
James Almer [Mon, 4 Aug 2014 02:53:40 +0000 (23:53 -0300)]
x86/vp9lpf: use fewer instructions in SPLATB_MIX

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix compile error on bfin.
Bernd Kuhls [Mon, 4 Aug 2014 19:12:29 +0000 (21:12 +0200)]
Fix compile error on bfin.

After the removal of all Blackfin architecture optimizations in
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b55d3bbeed375f7b74442c4dd274d116a3e3d2e1
some includes were left behind leading to a compile error:

CC      libavformat/adtsenc.o
In file included from ./libavcodec/get_bits.h:35,
                 from ./libavcodec/ac3_parser.h:27,
                 from libavformat/ac3dec.c:23:
./libavcodec/mathops.h:43:29: error: bfin/mathops.h: No such file or directory

This compile error was found by buildroot autobuild system:
http://autobuild.buildroot.net/results/ae0/ae056f267e907091d09d2a1546d6f1ae02fa23b9/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/swscale_internal: fix ya16 -> rgba
Michael Niedermayer [Mon, 4 Aug 2014 23:43:21 +0000 (01:43 +0200)]
swscale/swscale_internal: fix ya16 -> rgba

Fixes Ticket644

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/avfoundation: Add device category.
Thilo Borgmann [Mon, 4 Aug 2014 20:06:59 +0000 (22:06 +0200)]
lavd/avfoundation: Add device category.

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

* commit 'eee813eec7d3c0b0689f80665d3f796401742935':
  fate: Only generate tests/pixfmts.mak if some pixfmts fate test is run

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '990e2f3555bb0adae122d3599938ddcfee46e2d1'
Michael Niedermayer [Mon, 4 Aug 2014 23:15:00 +0000 (01:15 +0200)]
Merge commit '990e2f3555bb0adae122d3599938ddcfee46e2d1'

* commit '990e2f3555bb0adae122d3599938ddcfee46e2d1':
  avcodec: Suppress deprecation warnings from DTG code scheduled for removal

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

* commit '086a541857812b2e0435db38fbabfddc7d19e53c':
  fate: png-suite

Conflicts:
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/swscale_unscaled: fix ya16 input
Michael Niedermayer [Mon, 4 Aug 2014 22:33:27 +0000 (00:33 +0200)]
swscale/swscale_unscaled: fix ya16 input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '60cbd6ad84de0931314030b81df87b69d6196587'
Michael Niedermayer [Mon, 4 Aug 2014 20:51:19 +0000 (22:51 +0200)]
Merge commit '60cbd6ad84de0931314030b81df87b69d6196587'

* commit '60cbd6ad84de0931314030b81df87b69d6196587':
  tiff: support reading gray+alpha at 8 bits

Conflicts:
libavcodec/tiff.c

See: f746f3790168bf898b629942868bda703e7f1045
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 agompegts: Define the section length with a constant
Luca Barbato [Sun, 3 Aug 2014 17:27:07 +0000 (19:27 +0200)]
mpegts: Define the section length with a constant

The specification says the value is expressed in 10 bits including
the 4-byte CRC.

5 years agovc-1: Optimise parser (with special attention to ARM)
Ben Avison [Mon, 21 Jul 2014 13:53:09 +0000 (14:53 +0100)]
vc-1: Optimise parser (with special attention to ARM)

The previous implementation of the parser made four passes over each input
buffer (reduced to two if the container format already guaranteed the input
buffer corresponded to frames, such as with MKV). But these buffers are
often 200K in size, certainly enough to flush the data out of L1 cache, and
for many CPUs, all the way out to main memory. The passes were:

1) locate frame boundaries (not needed for MKV etc)
2) copy the data into a contiguous block (not needed for MKV etc)
3) locate the start codes within each frame
4) unescape the data between start codes

After this, the unescaped data was parsed to extract certain header fields,
but because the unescape operation was so large, this was usually also
effectively operating on uncached memory. Most of the unescaped data was
simply thrown away and never processed further. Only step 2 - because it
used memcpy - was using prefetch, making things even worse.

This patch reorganises these steps so that, aside from the copying, the
operations are performed in parallel, maximising cache utilisation. No more
than the worst-case number of bytes needed for header parsing is unescaped.
Most of the data is, in practice, only read in order to search for a start
code, for which optimised implementations already existed in the H264 codec
(notably the ARM version uses prefetch, so we end up doing both remaining
passes at maximum speed). For MKV files, we know when we've found the last
start code of interest in a given frame, so we are able to avoid doing even
that one remaining pass for most of the buffer.

In some use-cases (such as the Raspberry Pi) video decode is handled by the
GPU, but the entire elementary stream is still fed through the parser to
pick out certain elements of the header which are necessary to manage the
decode process. As you might expect, in these cases, the performance of the
parser is significant.

To measure parser performance, I used the same VC-1 elementary stream in
either an MPEG-2 transport stream or a MKV file, and fed it through avconv
with -c:v copy -c:a copy -f null. These are the gperftools counts for
those streams, both filtered to only include vc1_parse() and its callees,
and unfiltered (to include the whole binary). Lower numbers are better:

                Before          After
File  Filtered  Mean   StdDev   Mean   StdDev  Confidence  Change
M2TS  No        861.7  8.2      650.5  8.1     100.0%      +32.5%
MKV   No        868.9  7.4      731.7  9.0     100.0%      +18.8%
M2TS  Yes       250.0  11.2     27.2   3.4     100.0%      +817.9%
MKV   Yes       149.0  12.8     1.7    0.8     100.0%      +8526.3%

Yes, that last case shows vc1_parse() running 86 times faster! The M2TS
case does show a larger absolute improvement though, since it was worse
to begin with.

This patch has been tested with the FATE suite (albeit on x86 for speed).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agovc-1: Add platform-specific start code search routine to VC1DSPContext.
Ben Avison [Mon, 21 Jul 2014 13:53:08 +0000 (14:53 +0100)]
vc-1: Add platform-specific start code search routine to VC1DSPContext.

Initialise VC1DSPContext for parser as well as for decoder.
Note, the VC-1 code doesn't actually use the function pointer yet.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoh264: Move start code search functions into separate source files.
Ben Avison [Mon, 21 Jul 2014 15:25:48 +0000 (16:25 +0100)]
h264: Move start code search functions into separate source files.

This permits re-use with parsers for codecs which use similar start codes.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
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 agofate: Only generate tests/pixfmts.mak if some pixfmts fate test is run
Diego Biurrun [Sun, 3 Aug 2014 13:21:15 +0000 (06:21 -0700)]
fate: Only generate tests/pixfmts.mak if some pixfmts fate test is run

5 years agoavcodec: Suppress deprecation warnings from DTG code scheduled for removal
Diego Biurrun [Mon, 4 Aug 2014 10:39:34 +0000 (03:39 -0700)]
avcodec: Suppress deprecation warnings from DTG code scheduled for removal

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 agofate: png-suite
Vittorio Giovara [Wed, 23 Jul 2014 20:04:50 +0000 (21:04 +0100)]
fate: png-suite

Every supported format is converted to RGB.

5 years agotiff: support reading gray+alpha at 8 bits
Carl Eugen Hoyos [Sun, 20 Jul 2014 06:34:19 +0000 (02:34 -0400)]
tiff: support reading gray+alpha at 8 bits

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
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>