ffmpeg.git
4 years agoapng: Support inter-frame compression
Donny Yang [Wed, 19 Aug 2015 06:41:23 +0000 (06:41 +0000)]
apng: Support inter-frame compression

The current algorithm is just "try all the combinations, and pick the best".
It's not very fast either, probably due to a lot of copying, but will do for
an initial implementation.

Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/dnxhddata: Fix inconsistent table entry
Michael Niedermayer [Fri, 28 Aug 2015 01:34:40 +0000 (03:34 +0200)]
avcodec/dnxhddata: Fix inconsistent table entry

Fixes segfault
Fixes Ticket4809

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoconfigure: Print out enabled programs
rogerdpack [Thu, 27 Aug 2015 22:16:44 +0000 (16:16 -0600)]
configure: Print out enabled programs

Better message that ffplay is not going to be built by printing out what
will be built.

Based on a patch by Moritz Barsnick.

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
4 years agoavformat/segment: atomically update list if possible
Michael Niedermayer [Thu, 27 Aug 2015 21:40:25 +0000 (23:40 +0200)]
avformat/segment: atomically update list if possible

Fixes Ticket4802

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoffplay: remove unused include libavutil/colorspace.h
Zhang Rui [Thu, 27 Aug 2015 06:00:30 +0000 (14:00 +0800)]
ffplay: remove unused include libavutil/colorspace.h

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/af_amerge: use the name 's' for the pointer to the private context
Ganesh Ajjanagadde [Wed, 26 Aug 2015 16:53:44 +0000 (12:53 -0400)]
avfilter/af_amerge: use the name 's' for the pointer to the private context

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoavfilter: add framerate video filter
Paul B Mahol [Fri, 24 Jul 2015 07:09:16 +0000 (07:09 +0000)]
avfilter: add framerate video filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agolavf/mpegenc: provide better feedback in case of invalid media type
Stefano Sabatini [Thu, 27 Aug 2015 15:41:52 +0000 (17:41 +0200)]
lavf/mpegenc: provide better feedback in case of invalid media type

4 years agoavcodec: Assert on codec->encode2 in encode_audio2
lummax [Thu, 27 Aug 2015 10:40:30 +0000 (12:40 +0200)]
avcodec: Assert on codec->encode2 in encode_audio2

Assert on `avctx->codec->encode2` to avoid a SEGFAULT on the subsequent
function call.

avcodec_encode_video2() uses a similar assertion.
Calling the wrong function on a stream is a serious inconsistency
which could at other places be potentially dangerous and exploitable,
it is thus safer to stop execution and not continue with such
inconsistency after returning an error.

Commit-message-extended-by commiter
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agovaapi: Add hevc hwaccel support
Timo Rothenpieler [Wed, 26 Aug 2015 12:55:40 +0000 (14:55 +0200)]
vaapi: Add hevc hwaccel support

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
4 years agoconfigure: warn if GCC 4.2 is being used
Ganesh Ajjanagadde [Wed, 26 Aug 2015 13:36:25 +0000 (09:36 -0400)]
configure: warn if GCC 4.2 is being used

The wiki, Ticket1464, and Ticket3970 warn about the usage of GCC 4.2.
This fixes Ticket3970.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agolavc: Describe eia_608 as text subtitles.
Carl Eugen Hoyos [Thu, 27 Aug 2015 14:42:39 +0000 (16:42 +0200)]
lavc: Describe eia_608 as text subtitles.

4 years agoavcodec/libopusenc: Fix infinite loop on flushing after 0 input
Michael Niedermayer [Thu, 27 Aug 2015 10:44:31 +0000 (12:44 +0200)]
avcodec/libopusenc: Fix infinite loop on flushing after 0 input

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoconfigure: remove unused apply() function
Ganesh Ajjanagadde [Thu, 27 Aug 2015 05:08:34 +0000 (01:08 -0400)]
configure: remove unused apply() function

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04'
Hendrik Leppkes [Thu, 27 Aug 2015 07:53:07 +0000 (09:53 +0200)]
Merge commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04'

* commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04':
  webm: Explicitly select libvpx, libopus and libvorbis encoders

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '413d4e54a9bffe2d0afdc6d8a80f516e5df6a421'
Hendrik Leppkes [Thu, 27 Aug 2015 07:50:53 +0000 (09:50 +0200)]
Merge commit '413d4e54a9bffe2d0afdc6d8a80f516e5df6a421'

* commit '413d4e54a9bffe2d0afdc6d8a80f516e5df6a421':
  nvenc: Properly free the fifos

Not merged, ffmpeg's nvenc doesn't use these fifos.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '2157df425bd909854fd4afcec4aa3311d8a3b31b'
Hendrik Leppkes [Thu, 27 Aug 2015 07:49:21 +0000 (09:49 +0200)]
Merge commit '2157df425bd909854fd4afcec4aa3311d8a3b31b'

* commit '2157df425bd909854fd4afcec4aa3311d8a3b31b':
  hlsenc: Support outputting specific versions

Not merged, the version is auto-selected in ffmpeg based on enabled features.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'd68705c9756e6558c8e28d90b4c364f25ba72083'
Hendrik Leppkes [Thu, 27 Aug 2015 07:40:06 +0000 (09:40 +0200)]
Merge commit 'd68705c9756e6558c8e28d90b4c364f25ba72083'

* commit 'd68705c9756e6558c8e28d90b4c364f25ba72083':
  dnxhddata: Add tables for missing DNx100 profiles

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'a4615572b576d3ef7ee2f11529d935e61bf4ebb8'
Hendrik Leppkes [Thu, 27 Aug 2015 07:31:52 +0000 (09:31 +0200)]
Merge commit 'a4615572b576d3ef7ee2f11529d935e61bf4ebb8'

* commit 'a4615572b576d3ef7ee2f11529d935e61bf4ebb8':
  dnxhddata: Merge a few duplicated RUN tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'efbfb1ad1112cea79bef51fd9f30c0c94735abfc'
Hendrik Leppkes [Thu, 27 Aug 2015 07:29:54 +0000 (09:29 +0200)]
Merge commit 'efbfb1ad1112cea79bef51fd9f30c0c94735abfc'

* commit 'efbfb1ad1112cea79bef51fd9f30c0c94735abfc':
  dnxhddata: Group together RUN-related tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1'
Hendrik Leppkes [Thu, 27 Aug 2015 07:27:02 +0000 (09:27 +0200)]
Merge commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1'

* commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1':
  dnxhddata: Merge a few duplicated DC tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '5e129ed655bff5b6d90355c0b713d7aaba3898ec'
Hendrik Leppkes [Thu, 27 Aug 2015 07:26:14 +0000 (09:26 +0200)]
Merge commit '5e129ed655bff5b6d90355c0b713d7aaba3898ec'

* commit '5e129ed655bff5b6d90355c0b713d7aaba3898ec':
  dnxhddata: Group together DC-related tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'd3ae4c65942d67a294fd56eabbbdcce6756fab5f'
Hendrik Leppkes [Thu, 27 Aug 2015 07:19:41 +0000 (09:19 +0200)]
Merge commit 'd3ae4c65942d67a294fd56eabbbdcce6756fab5f'

* commit 'd3ae4c65942d67a294fd56eabbbdcce6756fab5f':
  dnxhddata: List the reused tables in a comment

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'fdd021884d5c06fb9ad65cb0040bb5717a7b084b'
Hendrik Leppkes [Thu, 27 Aug 2015 07:17:37 +0000 (09:17 +0200)]
Merge commit 'fdd021884d5c06fb9ad65cb0040bb5717a7b084b'

* commit 'fdd021884d5c06fb9ad65cb0040bb5717a7b084b':
  dnxhddata: Keep a single CID in the table names

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoavformat/oggenc: Check segments_count for headers too
Michael Niedermayer [Thu, 27 Aug 2015 02:08:42 +0000 (04:08 +0200)]
avformat/oggenc: Check segments_count for headers too

Fixes infinite loop and segfault in ogg_buffer_data()
Fixes Ticket4806

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoffmpeg_opt: Add -hwaccels option that lists all supported hwaccels
Timothy Gu [Tue, 25 Aug 2015 23:43:53 +0000 (16:43 -0700)]
ffmpeg_opt: Add -hwaccels option that lists all supported hwaccels

4 years agolavf/mov: Support unusual alac files without frma and alac atoms.
Carl Eugen Hoyos [Thu, 27 Aug 2015 01:29:29 +0000 (03:29 +0200)]
lavf/mov: Support unusual alac files without frma and alac atoms.

Fixes ticket #4747.

4 years agolavc/dnxhdenc: Fix ibias default.
Carl Eugen Hoyos [Thu, 27 Aug 2015 00:59:43 +0000 (02:59 +0200)]
lavc/dnxhdenc: Fix ibias default.

Fixes a regression since a8ab64d2 reported by Rens Dijkshoorn, rens offlinemedia nl.

4 years agoavfilter: add hstack & vstack filter
Paul B Mahol [Mon, 24 Aug 2015 20:00:59 +0000 (20:00 +0000)]
avfilter: add hstack & vstack filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/framesync: allocate FFFrameSyncIn internally
Paul B Mahol [Sat, 5 Oct 2013 20:19:23 +0000 (20:19 +0000)]
avfilter/framesync: allocate FFFrameSyncIn internally

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/vf_histogram: fix bug in checking pixel format flags
Paul B Mahol [Wed, 26 Aug 2015 11:02:50 +0000 (11:02 +0000)]
avfilter/vf_histogram: fix bug in checking pixel format flags

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/vf_vectorscope: fix bug in checking pixel format flags
Paul B Mahol [Wed, 26 Aug 2015 11:01:03 +0000 (11:01 +0000)]
avfilter/vf_vectorscope: fix bug in checking pixel format flags

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoconfigure: do not fork off grep subprocess while testing for whitespace
Ganesh Ajjanagadde [Wed, 26 Aug 2015 03:22:49 +0000 (23:22 -0400)]
configure: do not fork off grep subprocess while testing for whitespace

grep is not necessary for the functionality.
This avoids an unnecessary fork.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/af_aphaser: use the name 's' for the pointer to the private context
Paul B Mahol [Wed, 26 Aug 2015 09:49:02 +0000 (09:49 +0000)]
avfilter/af_aphaser: use the name 's' for the pointer to the private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/vf_blend: use the name 's' for the pointer to the private context
Paul B Mahol [Tue, 25 Aug 2015 17:00:03 +0000 (17:00 +0000)]
avfilter/vf_blend: use the name 's' for the pointer to the private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec/vdpau: fix compilation of mpeg1/mpeg4/vc1 decoders when h264 is disabled
James Almer [Tue, 25 Aug 2015 02:52:43 +0000 (23:52 -0300)]
avcodec/vdpau: fix compilation of mpeg1/mpeg4/vc1 decoders when h264 is disabled

Tested-by: wm4 <nfxjfg@googlemail.com>
Tested-by: Philip Langdale <philipl@overt.org>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavformat/segment: Do not free the filename twice
Michael Niedermayer [Wed, 26 Aug 2015 01:30:45 +0000 (03:30 +0200)]
avformat/segment: Do not free the filename twice

Bug introduced in 83a508cda5115c61b456aeb227bf770d61010961

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoswscale: Silence an unused variable warning
Timothy Gu [Wed, 26 Aug 2015 00:40:06 +0000 (17:40 -0700)]
swscale: Silence an unused variable warning

Also remove a pair of extraneous ifdeffery.

4 years agoffmpeg_opt: Add missing comma
Timothy Gu [Tue, 25 Aug 2015 23:48:52 +0000 (16:48 -0700)]
ffmpeg_opt: Add missing comma

4 years agomatroskaenc: Fix indentation
Timothy Gu [Tue, 25 Aug 2015 23:03:23 +0000 (16:03 -0700)]
matroskaenc: Fix indentation

Found-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agolavf/http: Fix parsing http request data to not read over '\0'.
Stephan Holljes [Thu, 20 Aug 2015 16:01:56 +0000 (18:01 +0200)]
lavf/http: Fix parsing http request data to not read over '\0'.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
4 years agoconfigure: aac encoder requires lpc
wm4 [Tue, 25 Aug 2015 16:54:39 +0000 (18:54 +0200)]
configure: aac encoder requires lpc

Fixes compilation with --disable-encoders --enable-encoder=aac

4 years agowebm: Explicitly select libvpx, libopus and libvorbis encoders
Luca Barbato [Sun, 9 Aug 2015 08:59:33 +0000 (10:59 +0200)]
webm: Explicitly select libvpx, libopus and libvorbis encoders

And update the preference for the newer codecs now that the libraries
seem stable and widespread enough.

Bug-Id: 695
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agonvenc: Properly free the fifos
Luca Barbato [Sun, 23 Aug 2015 23:29:59 +0000 (01:29 +0200)]
nvenc: Properly free the fifos

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agohlsenc: Support outputting specific versions
Luca Barbato [Sun, 16 Aug 2015 19:21:50 +0000 (21:21 +0200)]
hlsenc: Support outputting specific versions

Right now only version 2 and version 3 are supported.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agocheckasm: Fix floating point arguments on 64-bit Windows
Henrik Gramner [Mon, 24 Aug 2015 20:52:02 +0000 (22:52 +0200)]
checkasm: Fix floating point arguments on 64-bit Windows

4 years agoavformat/aa: use correct format specifier in sscanf
Vesselin Bontchev [Tue, 25 Aug 2015 12:37:02 +0000 (12:37 +0000)]
avformat/aa: use correct format specifier in sscanf

This demuxer was broken on a large number of platforms due to usage of wrong
format specifier in sscanf. This patch fixes the problem, and also adds some
debug logging to reduce future debugging pain.

4 years agolavf/segment: Fix memleak.
Carl Eugen Hoyos [Tue, 25 Aug 2015 11:36:24 +0000 (13:36 +0200)]
lavf/segment: Fix memleak.

Reviewed-by: Stefano Sabatini
Reviewed-by: Ganesh Ajjanagadde
4 years agoavformat/file: Check for lstat() instead of dirent.h
Michael Niedermayer [Tue, 25 Aug 2015 10:48:12 +0000 (12:48 +0200)]
avformat/file: Check for lstat() instead of dirent.h

Fixes build on mingw

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agofate: add tests for vectorscope filter
Paul B Mahol [Mon, 24 Aug 2015 07:43:04 +0000 (07:43 +0000)]
fate: add tests for vectorscope filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agolavf/dnxhd: Autodetect more valid files.
Carl Eugen Hoyos [Tue, 25 Aug 2015 10:06:54 +0000 (12:06 +0200)]
lavf/dnxhd: Autodetect more valid files.

4 years agolavf/file: check for dirent.h support
Mariusz SzczepaƄczyk [Sun, 28 Jun 2015 22:13:43 +0000 (00:13 +0200)]
lavf/file: check for dirent.h support

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavf/file: implement directory listing callbacks
Lukasz Marek [Sun, 21 Jun 2015 22:01:32 +0000 (00:01 +0200)]
lavf/file: implement directory listing callbacks

Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoconfigure: do not fork off grep subprocess in probe_cc
Ganesh Ajjanagadde [Mon, 24 Aug 2015 19:38:18 +0000 (15:38 -0400)]
configure: do not fork off grep subprocess in probe_cc

grep is not required for the functionality in this instance.
This avoids an unnecessary fork, and also avoids a duplicated dumpversion call.
Furthermore, it also corrects behavior when no minor version number is present, see e.g
https://github.com/joyent/node/pull/25671.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/mjpegdec: Remove message asking for a non mod 16 AMV sample
Michael Niedermayer [Mon, 24 Aug 2015 17:19:37 +0000 (19:19 +0200)]
avcodec/mjpegdec: Remove message asking for a non mod 16 AMV sample

Ticket4770 contains such a sample and it decodes fine

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/vf_vectorscope: add options with shorter name
Paul B Mahol [Mon, 24 Aug 2015 14:21:26 +0000 (14:21 +0000)]
avfilter/vf_vectorscope: add options with shorter name

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/vf_vectorscope: make intensity user configurable
Paul B Mahol [Sun, 23 Aug 2015 11:54:16 +0000 (11:54 +0000)]
avfilter/vf_vectorscope: make intensity user configurable

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agodnxhddata: Add tables for missing DNx100 profiles
Vittorio Giovara [Thu, 30 Jul 2015 14:55:39 +0000 (15:55 +0100)]
dnxhddata: Add tables for missing DNx100 profiles

1440x1080@8 progressive (1259) and interlaced (1260).

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agodnxhddata: Merge a few duplicated RUN tables
Vittorio Giovara [Thu, 30 Jul 2015 14:55:38 +0000 (15:55 +0100)]
dnxhddata: Merge a few duplicated RUN tables

4 years agodnxhddata: Group together RUN-related tables
Vittorio Giovara [Thu, 30 Jul 2015 14:55:37 +0000 (15:55 +0100)]
dnxhddata: Group together RUN-related tables

This helps in finding duplicates.

4 years agodnxhddata: Merge a few duplicated DC tables
Vittorio Giovara [Thu, 30 Jul 2015 14:55:36 +0000 (15:55 +0100)]
dnxhddata: Merge a few duplicated DC tables

4 years agodnxhddata: Group together DC-related tables
Vittorio Giovara [Thu, 30 Jul 2015 14:55:35 +0000 (15:55 +0100)]
dnxhddata: Group together DC-related tables

This helps in finding duplicates.

4 years agodnxhddata: List the reused tables in a comment
Vittorio Giovara [Thu, 30 Jul 2015 14:55:34 +0000 (15:55 +0100)]
dnxhddata: List the reused tables in a comment

4 years agodnxhddata: Keep a single CID in the table names
Vittorio Giovara [Thu, 30 Jul 2015 14:55:33 +0000 (15:55 +0100)]
dnxhddata: Keep a single CID in the table names

Use a comment to list the reused tables, since it's more flexible than a
table name to keep information like this. The list will expand in later
commits.

4 years agoavformat/hevc: Check num_long_term_ref_pics_sps to avoid potentially long loops
Michael Niedermayer [Mon, 24 Aug 2015 11:04:38 +0000 (13:04 +0200)]
avformat/hevc: Check num_long_term_ref_pics_sps to avoid potentially long loops

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/hevc: Fix parsing errors
Arthur Grant [Mon, 24 Aug 2015 10:19:03 +0000 (12:19 +0200)]
avformat/hevc: Fix parsing errors

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'e23f84d9652474353d8bbc42787a56ec1991908f'
Hendrik Leppkes [Mon, 24 Aug 2015 08:40:24 +0000 (10:40 +0200)]
Merge commit 'e23f84d9652474353d8bbc42787a56ec1991908f'

* commit 'e23f84d9652474353d8bbc42787a56ec1991908f':
  channel_layout: Add a 16channel default layout

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'd5eab59a5373b22aa52d6053a8e853e95a6e131e'
Hendrik Leppkes [Mon, 24 Aug 2015 08:39:08 +0000 (10:39 +0200)]
Merge commit 'd5eab59a5373b22aa52d6053a8e853e95a6e131e'

* commit 'd5eab59a5373b22aa52d6053a8e853e95a6e131e':
  aac: Make sure to set err on the failure path

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '167ea1fbf15ecefa30729f9b8d091ed431bf43bd'
Hendrik Leppkes [Mon, 24 Aug 2015 08:37:50 +0000 (10:37 +0200)]
Merge commit '167ea1fbf15ecefa30729f9b8d091ed431bf43bd'

* commit '167ea1fbf15ecefa30729f9b8d091ed431bf43bd':
  xavs: Do not try to set the bitrate tolerance without a bitrate

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '61d8fa2a1ab76f0f3ac1442faa104ace4b29decc'
Hendrik Leppkes [Mon, 24 Aug 2015 08:36:27 +0000 (10:36 +0200)]
Merge commit '61d8fa2a1ab76f0f3ac1442faa104ace4b29decc'

* commit '61d8fa2a1ab76f0f3ac1442faa104ace4b29decc':
  h264: Fix faulty call to avpriv_request_sample

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068'
Hendrik Leppkes [Mon, 24 Aug 2015 08:36:07 +0000 (10:36 +0200)]
Merge commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068'

* commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068':
  h264: Discard currently unsupported registered sei

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '47b447aaff1bc30ba986ca757346a2c5c95b786a'
Hendrik Leppkes [Mon, 24 Aug 2015 08:34:38 +0000 (10:34 +0200)]
Merge commit '47b447aaff1bc30ba986ca757346a2c5c95b786a'

* commit '47b447aaff1bc30ba986ca757346a2c5c95b786a':
  imgutils: Fix a typo in avcodec_get_pix_fmt_loss

Not merged, this code was refactored and moved to avutil.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'd8ebb6157d12183ed3fc987cd2ba18b404758828'
Hendrik Leppkes [Mon, 24 Aug 2015 08:32:34 +0000 (10:32 +0200)]
Merge commit 'd8ebb6157d12183ed3fc987cd2ba18b404758828'

* commit 'd8ebb6157d12183ed3fc987cd2ba18b404758828':
  hevcdsp: fix a function name

Not merged, ffmpeg has no function of this name anymore.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'a1926a29fb4325afa46842883f197c74d4535c36'
Hendrik Leppkes [Mon, 24 Aug 2015 08:29:26 +0000 (10:29 +0200)]
Merge commit 'a1926a29fb4325afa46842883f197c74d4535c36'

* commit 'a1926a29fb4325afa46842883f197c74d4535c36':
  hevc: avoid invalid shifts of negative values

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '515b69f8f8e9a24cfaee95d8c1f63f265d8582fe'
Hendrik Leppkes [Mon, 24 Aug 2015 08:27:39 +0000 (10:27 +0200)]
Merge commit '515b69f8f8e9a24cfaee95d8c1f63f265d8582fe'

* commit '515b69f8f8e9a24cfaee95d8c1f63f265d8582fe':
  checkasm: Explicitly declare function prototypes

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'e13da244f41610ee073b2f72bcf62b60fa402bb5'
Hendrik Leppkes [Mon, 24 Aug 2015 08:26:29 +0000 (10:26 +0200)]
Merge commit 'e13da244f41610ee073b2f72bcf62b60fa402bb5'

* commit 'e13da244f41610ee073b2f72bcf62b60fa402bb5':
  checkasm: x86: properly save rdx/edx in checked_call()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'faa3f17a76333b672ce4a40cf80f678ab68bdbae'
Hendrik Leppkes [Mon, 24 Aug 2015 08:25:41 +0000 (10:25 +0200)]
Merge commit 'faa3f17a76333b672ce4a40cf80f678ab68bdbae'

* commit 'faa3f17a76333b672ce4a40cf80f678ab68bdbae':
  fate: test only demuxing in asf-repldata

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agofate: add tests for waveform filter
Paul B Mahol [Sat, 22 Aug 2015 21:16:56 +0000 (21:16 +0000)]
fate: add tests for waveform filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agofate: add api-band-test
Ludmila Glinskih [Mon, 24 Aug 2015 00:11:45 +0000 (03:11 +0300)]
fate: add api-band-test

Works only for flv, h263 and huffyuv decoders.
Makes only one pass through the file (this should be changed to two passes)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agortpenc_chain: also copy AVFMT_FLAG_BITEXACT to new AVFormatContext
Andreas Cadhalpun [Sun, 23 Aug 2015 09:53:09 +0000 (11:53 +0200)]
rtpenc_chain: also copy AVFMT_FLAG_BITEXACT to new AVFormatContext

Otherwise it is impossible to make '-movflags +rtphint' bitexact after
FF_API_LAVF_BITEXACT has been disabled.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agooptions_table: fix compatibility with MSVC
Andreas Cadhalpun [Sun, 23 Aug 2015 09:16:10 +0000 (11:16 +0200)]
options_table: fix compatibility with MSVC

Including libavutil/internal.h breaks compilation of doc/print_options.c
with MSVC due to linking avpriv_strtod/avpriv_snprintf.

This reverts part of commit 095347f.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavcodec: remove FF_API_LOWRES around max_lowres
Andreas Cadhalpun [Fri, 21 Aug 2015 21:58:56 +0000 (23:58 +0200)]
avcodec: remove FF_API_LOWRES around max_lowres

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoswresample/dither: use integer arithmetic
Ganesh Ajjanagadde [Sun, 23 Aug 2015 20:31:12 +0000 (16:31 -0400)]
swresample/dither: use integer arithmetic

This fixes a -Wabsolute-value reported by clang 3.5+ complaining about misuse of fabs() for integer absolute value.
An additional benefit is the removal of floating point calculations.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agochannel_layout: Add a 16channel default layout
Luca Barbato [Fri, 21 Aug 2015 07:02:04 +0000 (09:02 +0200)]
channel_layout: Add a 16channel default layout

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoaac: Make sure to set err on the failure path
Luca Barbato [Sun, 23 Aug 2015 09:58:47 +0000 (11:58 +0200)]
aac: Make sure to set err on the failure path

Bug-Id: CID 1308153

4 years agoxavs: Do not try to set the bitrate tolerance without a bitrate
Luca Barbato [Sun, 23 Aug 2015 15:57:21 +0000 (17:57 +0200)]
xavs: Do not try to set the bitrate tolerance without a bitrate

Avoid a division by zero.

Bug-Id: CID 1257655

4 years agoavdevice/lavfi: fix self assignment warning
Ganesh Ajjanagadde [Sun, 23 Aug 2015 03:24:38 +0000 (23:24 -0400)]
avdevice/lavfi: fix self assignment warning

FAIL(ret) expands to statements including a silly ret=ret.
This triggers a -Wself-assign on confirmed clang 3.6, and so we fix it.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/vf_histogram: levels: support more input pixel formats
Paul B Mahol [Sun, 23 Aug 2015 10:10:34 +0000 (10:10 +0000)]
avfilter/vf_histogram: levels: support more input pixel formats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavformat: Remove use of AVFrac and AVStream->pts
Michael Niedermayer [Mon, 17 Aug 2015 14:30:16 +0000 (16:30 +0200)]
avformat: Remove use of AVFrac and AVStream->pts

Move field to internal part of AVStream and struct to internal.h

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/x86/mpegaudiodsp: correct asm guards
Ganesh Ajjanagadde [Fri, 21 Aug 2015 17:43:43 +0000 (13:43 -0400)]
avcodec/x86/mpegaudiodsp: correct asm guards

Fixes -Wunused-function warnings when compiling with --disable-yasm on x86.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agofate: temporarily disable AAC TNS test
Rostislav Pehlivanov [Sun, 23 Aug 2015 00:04:06 +0000 (01:04 +0100)]
fate: temporarily disable AAC TNS test

Fixing it will take a bit longer, so just suspend the test.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agoaacenc_tns: temporarily disable
Rostislav Pehlivanov [Sat, 22 Aug 2015 22:49:59 +0000 (23:49 +0100)]
aacenc_tns: temporarily disable

Due to segfaults on some platforms, fix will take a bit longer.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agoswscale/alphablend: fix pointer cast
Ganesh Ajjanagadde [Sat, 22 Aug 2015 02:34:16 +0000 (22:34 -0400)]
swscale/alphablend: fix pointer cast

Commit 7c72a4bbd3a0ca421c7419abad2fb65aa713dd8b was slightly wrong

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoavfilter: add waveform monitor filter
Paul B Mahol [Sun, 16 Aug 2015 11:01:53 +0000 (13:01 +0200)]
avfilter: add waveform monitor filter

4 years agoavfilter/vf_vectorscope: add more pixel formats
Paul B Mahol [Sat, 22 Aug 2015 17:30:48 +0000 (17:30 +0000)]
avfilter/vf_vectorscope: add more pixel formats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agodisable deprecation warnings in deprecated code
Andreas Cadhalpun [Sat, 8 Aug 2015 08:41:33 +0000 (10:41 +0200)]
disable deprecation warnings in deprecated code

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agofate: replace deprecated request_channels with request_channel_layout
Andreas Cadhalpun [Sat, 8 Aug 2015 08:41:32 +0000 (10:41 +0200)]
fate: replace deprecated request_channels with request_channel_layout

This fixes fate with FF_API_REQUEST_CHANNELS disabled.

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoopenal-dec: replace av_destruct_packet with av_free_packet
Andreas Cadhalpun [Sat, 8 Aug 2015 08:41:31 +0000 (10:41 +0200)]
openal-dec: replace av_destruct_packet with av_free_packet

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoadd missing FF_API_DESTRUCT_PACKET guards
Andreas Cadhalpun [Sat, 8 Aug 2015 08:41:30 +0000 (10:41 +0200)]
add missing FF_API_DESTRUCT_PACKET guards

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavcodec: Fix `make checkheaders`
Timothy Gu [Sat, 22 Aug 2015 17:14:17 +0000 (10:14 -0700)]
avcodec: Fix `make checkheaders`