ffmpeg.git
4 years agowtvdec: Removed unused variable
Timothy Gu [Sun, 31 Jan 2016 23:52:23 +0000 (15:52 -0800)]
wtvdec: Removed unused variable

4 years agoall: Make header guard names consistent
Timothy Gu [Fri, 29 Jan 2016 02:25:13 +0000 (18:25 -0800)]
all: Make header guard names consistent

4 years agowtv: Speed up wtv index creation
popcornmix [Fri, 29 Jan 2016 20:27:00 +0000 (20:27 +0000)]
wtv: Speed up wtv index creation

The index creation is O(N^2) with number of entries (typically thousands).
On a Pi this can take more than 60 seconds to execute for a recording of a few hours.

By replacing with an O(N) loop, this takes virtually zero time

Liked-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agovf_phase: Reduce the scope of several variables
Timothy Gu [Sat, 30 Jan 2016 18:00:19 +0000 (10:00 -0800)]
vf_phase: Reduce the scope of several variables

Reviewed-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/avf_showfreqs: properly handle pts
Paul B Mahol [Sun, 31 Jan 2016 20:38:49 +0000 (21:38 +0100)]
avfilter/avf_showfreqs: properly handle pts

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agomsvc: Fix libx264 linking
Henrik Gramner [Wed, 27 Jan 2016 21:41:43 +0000 (22:41 +0100)]
msvc: Fix libx264 linking

4 years agoavcodec/flacenc: Fix prediction_order parameter
Michael Niedermayer [Sun, 31 Jan 2016 19:04:17 +0000 (20:04 +0100)]
avcodec/flacenc: Fix prediction_order parameter

Fixes regression

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoflacenc: Restore defaults and range for {min,max}_prediction_order
Derek Buitenhuis [Sun, 31 Jan 2016 18:25:29 +0000 (18:25 +0000)]
flacenc: Restore defaults and range for {min,max}_prediction_order

This was broken in 243df1351d2d928caa084a5704ed783f0b83f072.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoavcodec/dca: add new decoder based on libdcadec
foo86 [Sat, 16 Jan 2016 08:54:38 +0000 (11:54 +0300)]
avcodec/dca: add new decoder based on libdcadec

4 years agoavcodec/dca: add generic defines
foo86 [Sat, 16 Jan 2016 08:56:26 +0000 (11:56 +0300)]
avcodec/dca: add generic defines

4 years agoavcodec/synth_filter: add more filters
foo86 [Thu, 7 Jan 2016 21:49:56 +0000 (00:49 +0300)]
avcodec/synth_filter: add more filters

4 years agoavcodec/synth_filter: fix whitespace
foo86 [Thu, 7 Jan 2016 14:27:00 +0000 (17:27 +0300)]
avcodec/synth_filter: fix whitespace

4 years agoavcodec/dca: add math helpers and fixed point DCT
foo86 [Thu, 7 Jan 2016 21:48:57 +0000 (00:48 +0300)]
avcodec/dca: add math helpers and fixed point DCT

4 years agoavcodec/dca: add more tables
foo86 [Thu, 7 Jan 2016 14:15:22 +0000 (17:15 +0300)]
avcodec/dca: add more tables

4 years agoavcodec/dca: add REV1AUX sync word
foo86 [Thu, 7 Jan 2016 13:37:46 +0000 (16:37 +0300)]
avcodec/dca: add REV1AUX sync word

4 years agoavcodec/dca: remove old decoder
foo86 [Sat, 16 Jan 2016 08:07:08 +0000 (11:07 +0300)]
avcodec/dca: remove old decoder

Remove all files and functions which are not going to be reused,
and disable all functions and FATE tests temporarily which will be.

4 years agofate/ffm: Update test ref
Derek Buitenhuis [Sun, 31 Jan 2016 16:06:40 +0000 (16:06 +0000)]
fate/ffm: Update test ref

Since timecode_frame)start is a private option now, it stays at the default,
and is no longer written to the file.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '243df1351d2d928caa084a5704ed783f0b83f072'
Derek Buitenhuis [Sun, 31 Jan 2016 13:24:50 +0000 (13:24 +0000)]
Merge commit '243df1351d2d928caa084a5704ed783f0b83f072'

* commit '243df1351d2d928caa084a5704ed783f0b83f072':
  lavc: Move {min,max}_prediction_order to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd'
Derek Buitenhuis [Sun, 31 Jan 2016 13:19:50 +0000 (13:19 +0000)]
Merge commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd'

* commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd':
  lavc: Move rtp_payload_size to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'd749615333084e62c9fcc480d1ae466369fdf14f'
Derek Buitenhuis [Sun, 31 Jan 2016 12:28:04 +0000 (12:28 +0000)]
Merge commit 'd749615333084e62c9fcc480d1ae466369fdf14f'

* commit 'd749615333084e62c9fcc480d1ae466369fdf14f':
  lavc: Move timecode_frame_start to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoavcodec/fraps: remove superfluous "Fraps:" from av_log
Paul B Mahol [Sun, 31 Jan 2016 11:59:28 +0000 (12:59 +0100)]
avcodec/fraps: remove superfluous "Fraps:" from av_log

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agodoc/filters.texi: fix typo in spectrumsynth example
Paul B Mahol [Sun, 31 Jan 2016 10:21:58 +0000 (11:21 +0100)]
doc/filters.texi: fix typo in spectrumsynth example

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec/rawdec: Switch to monowhite if there is no palette & bpp=1
Michael Niedermayer [Sun, 31 Jan 2016 03:10:02 +0000 (04:10 +0100)]
avcodec/rawdec: Switch to monowhite if there is no palette & bpp=1

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/format: Weight the filename extension higher if there is nearly no data...
Michael Niedermayer [Sat, 30 Jan 2016 21:01:16 +0000 (22:01 +0100)]
avformat/format: Weight the filename extension higher if there is nearly no data after an ID3 available

Fixes Ticket5205

Based-on-patch-by: Carl Eugen Hoyos
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/format: Replace nodat by enum
Michael Niedermayer [Sat, 30 Jan 2016 20:48:16 +0000 (21:48 +0100)]
avformat/format: Replace nodat by enum

This makes the code much more readable

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec: Add forgotten minor bump, add Changelog and add Cineform to general.texi
Kieran Kunhya [Sat, 30 Jan 2016 18:09:36 +0000 (18:09 +0000)]
avcodec: Add forgotten minor bump, add Changelog and add Cineform to general.texi

4 years agoavcodec: Cineform HD Decoder
Kieran Kunhya [Sat, 30 Jan 2016 17:39:48 +0000 (17:39 +0000)]
avcodec: Cineform HD Decoder

Decodes YUV 4:2:2 10-bit and RGB 12-bit files.
Older files with more subbands, skips, Bayer, alpha not supported.
Alpha requires addition of GBRAP12 pixel format.

4 years agolavc/exr: Move setting SAR down.
Carl Eugen Hoyos [Sat, 30 Jan 2016 12:38:16 +0000 (13:38 +0100)]
lavc/exr: Move setting SAR down.

Fixes a theoretical issue if the resolution attribute is written
behind the aspect attribute.

4 years agolavc/v210dec: Allow odd width.
Carl Eugen Hoyos [Sat, 30 Jan 2016 12:31:44 +0000 (13:31 +0100)]
lavc/v210dec: Allow odd width.

The rightmost column is not decoded correctly.

Fixes a part of ticket #5195.

4 years agoChangelog: Sanitize Common Encryption entries.
Carl Eugen Hoyos [Sat, 30 Jan 2016 12:30:29 +0000 (13:30 +0100)]
Changelog: Sanitize Common Encryption entries.

4 years agolavc/utils: fix instanciate/instantiate typo
Clément Bœsch [Sat, 30 Jan 2016 12:10:11 +0000 (13:10 +0100)]
lavc/utils: fix instanciate/instantiate typo

4 years agolavf/vqf: fix suported/supported typo
Clément Bœsch [Sat, 30 Jan 2016 12:08:37 +0000 (13:08 +0100)]
lavf/vqf: fix suported/supported typo

4 years agolibx265: Remove experimental flag when encoding 4:2:2 and 4:4:4
Stephen Hutchinson [Wed, 27 Jan 2016 00:10:01 +0000 (19:10 -0500)]
libx265: Remove experimental flag when encoding 4:2:2 and 4:4:4

4:2:2 and 4:4:4 support in the HEVC standard was approved in
October 2014 as part of HEVC Version 2 and published in
January 2015:

http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=12296
http://www.itu.int/rec/T-REC-H.265-201410-S
https://hevc.hhi.fraunhofer.de/rext

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec: Remove libvo-aacenc support.
Kieran Kunhya [Sat, 30 Jan 2016 01:23:33 +0000 (17:23 -0800)]
avcodec: Remove libvo-aacenc support.

The internal encoder is superior to libvo-aacenc.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
4 years agoavcodec: Remove libaacplus
Timothy Gu [Sun, 24 Jan 2016 17:49:12 +0000 (09:49 -0800)]
avcodec: Remove libaacplus

TODO: bump minor

It's inferior in quality to fdk-aac and has an arguably more problematic
license.

As early as 2012, a HydrogenAudio user reported:

> It has however one huge advantage: much better quality at low bitrates than
> faac and libaacplus.

(https://hydrogenaud.io/index.php?PHPSESSID=ckiq394pdglka0kj2fin6ij8t7&topic=95989.msg804633#msg804633)

I myself have made a few spectrograms for a comparison of the two
encoders as well. The FDK output is consistently better than the
libaacplus one, in all bitrates I tested.

libaacplus license is 3GPP + LGPLv2. 3GPP copyright notice is completely
proprietory, as follows:

> No part may be reproduced except as authorized by written permission.
>
> The copyright and the foregoing restriction extend to reproduction in
> all media.
>
> © 2008, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TTA, TTC).
>
> All rights reserved.

(The latest 26410-d00 zip from 3GPP has the same notice, but the copyright
year is changed to 2015)

The copyright part of the FDK AAC license (section 2) is a copyleft
license that permits redistribution under certain conditions (and
therefore the LGPL + libfdk-aac combination is not prohibited by
configure):

> Redistribution and use in source and binary forms, with or without
> modification, are permitted without payment of copyright license fees
> provided that you satisfy the following conditions:
>
> You must retain the complete text of this software license in
> redistributions of the FDK AAC Codec or your modifications thereto in
> source code form.
>
> You must retain the complete text of this software license in the
> documentation and/or other materials provided with redistributions of
> the FDK AAC Codec or your modifications thereto in binary form.
>
> You must make available free of charge copies of the complete source
> code of the FDK AAC Codec and your modifications thereto to recipients
> of copies in binary form.
>
> The name of Fraunhofer may not be used to endorse or promote products
> derived from this library without prior written permission.
>
> You may not charge copyright license fees for anyone to use, copy or
> distribute the FDK AAC Codec software or your modifications thereto.
>
> Your modified versions of the FDK AAC Codec must carry prominent
> notices stating that you changed the software and the date of any
> change. For modified versions of the FDK AAC Codec, the term
> "Fraunhofer FDK AAC Codec Library for Android" must be replaced by the
> term "Third-Party Modified Version of the Fraunhofer FDK AAC Codec
> Library for Android."

4 years agoavcodec/proresdec_lgpl: use av_mod_uintp2
James Almer [Mon, 18 Jan 2016 21:37:55 +0000 (18:37 -0300)]
avcodec/proresdec_lgpl: use av_mod_uintp2

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec/pngdec: use av_mod_uintp2
James Almer [Mon, 18 Jan 2016 21:37:36 +0000 (18:37 -0300)]
avcodec/pngdec: use av_mod_uintp2

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec/amrwbdec: use av_mod_uintp2
James Almer [Mon, 18 Jan 2016 21:36:48 +0000 (18:36 -0300)]
avcodec/amrwbdec: use av_mod_uintp2

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agolavf/flvdec: Allow files where the PreviousTagSize is not set according to the spec.
Thierry Foucu [Fri, 29 Jan 2016 18:47:49 +0000 (10:47 -0800)]
lavf/flvdec: Allow files where the PreviousTagSize is not set according to the spec.

Some muxer use the FLV field PreviousTagSize to be the sum of tag
length. Without this change, the flv demuxer think the file is broken
and the re-sync will fail.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agompegtsenc: Do not fail ADTS AAC muxing if the first frame is not ADTS
Hagen Schmidt [Tue, 15 Dec 2015 07:00:48 +0000 (08:00 +0100)]
mpegtsenc: Do not fail ADTS AAC muxing if the first frame is not ADTS

Fixes ticket 279.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavformat/network: use defined constant in poll
Zhao Zhili [Wed, 27 Jan 2016 03:00:17 +0000 (11:00 +0800)]
libavformat/network: use defined constant in poll

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/avio: free url/avio options
Michael Niedermayer [Thu, 28 Jan 2016 22:49:06 +0000 (23:49 +0100)]
avformat/avio: free url/avio options

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavutil/mastering_display_metadata.h: change fields to be rationals as this is...
Neil Birkbeck [Tue, 26 Jan 2016 22:14:20 +0000 (14:14 -0800)]
libavutil/mastering_display_metadata.h: change fields to be rationals as this is how they are typically coded.

(this structure is not referenced anywhere yet)

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/dvaudio: add missing header include
James Almer [Fri, 29 Jan 2016 16:57:15 +0000 (13:57 -0300)]
avcodec/dvaudio: add missing header include

Should fix make checkheaders

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agolavc/rawdec: Use AV_PIX_FMT_PAL8 for raw 1 bpp video in AVI
Mats Peterson [Thu, 28 Jan 2016 05:15:29 +0000 (06:15 +0100)]
lavc/rawdec: Use AV_PIX_FMT_PAL8 for raw 1 bpp video in AVI

 From
https://msdn.microsoft.com/en-us/library/windows/desktop/dd318229%28v=vs.85%29.aspx:

"If biCompression equals BI_RGB and the bitmap uses 8 bpp or less, the
bitmap has a color table immediatelly following the BITMAPINFOHEADER
structure. The color table consists of an array of RGBQUAD values. The
size of the array is given by the biClrUsed member. If biClrUsed is
zero, the array contains the maximum number of colors for the given
bitdepth; that is, 2^biBitCount colors."

Nothing about "monochrome" here. Unfortunately, pal8 to monow conversion
seems a bit flaky, but that's another story.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavdevice/decklink_common.h: fix broken build due to missing `/`
Michael Ira Krufky [Fri, 29 Jan 2016 11:49:46 +0000 (06:49 -0500)]
libavdevice/decklink_common.h: fix broken build due to missing `/`

Signed-off-by: Michael Ira Krufky <mkrufky@linuxtv.org>
4 years agoavcodec/huffyuvenc: Remove duplicate include
Michael Niedermayer [Fri, 29 Jan 2016 10:27:43 +0000 (11:27 +0100)]
avcodec/huffyuvenc: Remove duplicate include

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoffmpeg: replace "flush Media" with "flush_media" in benchmark_all output
Stefano Sabatini [Wed, 27 Jan 2016 11:46:36 +0000 (12:46 +0100)]
ffmpeg: replace "flush Media" with "flush_media" in benchmark_all output

Simplify parsing and consistency.

4 years agoamrwbdec_mips: Add missing ff_ prefix
Timothy Gu [Fri, 29 Jan 2016 02:32:47 +0000 (18:32 -0800)]
amrwbdec_mips: Add missing ff_ prefix

4 years agoall: Add missing header guards
Timothy Gu [Fri, 29 Jan 2016 02:00:33 +0000 (18:00 -0800)]
all: Add missing header guards

4 years agoconfigure: remove libzvbi GPL dependency
Marton Balint [Thu, 14 Jan 2016 02:34:57 +0000 (03:34 +0100)]
configure: remove libzvbi GPL dependency

The COPYING.LIB file in the zvbi source tree as well as libzvbi.h references
the GNU Library General Public License version 2 since version 0.2.28.

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agolavd/decklink_dec: add support for teletext
Marton Balint [Tue, 12 Jan 2016 02:09:37 +0000 (03:09 +0100)]
lavd/decklink_dec: add support for teletext

It uses the libzvbi slicer, therefore teletext capture requires libzvbi.

Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoconfigure: use -ldl for decklink
Marton Balint [Sun, 10 Jan 2016 03:08:12 +0000 (04:08 +0100)]
configure: use -ldl for decklink

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agolavf: bump micro version after the new segment muxer options
Marton Balint [Fri, 29 Jan 2016 00:40:54 +0000 (01:40 +0100)]
lavf: bump micro version after the new segment muxer options

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agolavf/segment: add new option segment_clocktime_wrap_duration
Marton Balint [Mon, 18 Jan 2016 00:29:06 +0000 (01:29 +0100)]
lavf/segment: add new option segment_clocktime_wrap_duration

This option can force the segmenter to only start a new segment if a packet
reaches the muxer within the specified duration after the segmenting clock
time, which makes it more resilient to backward local time jumps, such as leap
seconds or transition to standard time from daylight savings time.

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agolavf/segment: add support for specifying clock time offset
Marton Balint [Wed, 13 Jan 2016 00:44:36 +0000 (01:44 +0100)]
lavf/segment: add support for specifying clock time offset

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agolibx264: Make sure to preserve default option values
Vittorio Giovara [Thu, 28 Jan 2016 16:38:27 +0000 (11:38 -0500)]
libx264: Make sure to preserve default option values

The private options chromaoffset, sc_threshold, and noise_reduction
were set to 0 rather than -1, and were always initializing values
in libx264 rather than letting the library use its default.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/libx264: Fix sc_threshold after 30c1bdb87ce336f2b9957769e30a10d72f93d372
Michael Niedermayer [Thu, 28 Jan 2016 17:10:34 +0000 (18:10 +0100)]
avcodec/libx264: Fix sc_threshold after 30c1bdb87ce336f2b9957769e30a10d72f93d372

After the merge the default threshold was unconditionally overwritten

A similar fix was written by Vittorio Giovara, but i didnt see that before
i wrote this and it also doesnt apply cleanly

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/frame_thread_encoder: Check the private option for huffy's context modelling
Derek Buitenhuis [Thu, 28 Jan 2016 17:19:06 +0000 (17:19 +0000)]
avcodec/frame_thread_encoder: Check the private option for huffy's context modelling

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '96c373c7704aeb1cc1d2c275fbb5d71777665589'
Derek Buitenhuis [Thu, 28 Jan 2016 16:54:26 +0000 (16:54 +0000)]
Merge commit '96c373c7704aeb1cc1d2c275fbb5d71777665589'

* commit '96c373c7704aeb1cc1d2c275fbb5d71777665589':
  lavc: Move context_model to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '12b49769223234673db1003d9c43e7483ceb0282'
Derek Buitenhuis [Thu, 28 Jan 2016 16:44:59 +0000 (16:44 +0000)]
Merge commit '12b49769223234673db1003d9c43e7483ceb0282'

* commit '12b49769223234673db1003d9c43e7483ceb0282':
  lavc: Move mpeg_quant to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '1482aff2048511b821ff9feac19426113cc641a2'
Derek Buitenhuis [Thu, 28 Jan 2016 16:38:04 +0000 (16:38 +0000)]
Merge commit '1482aff2048511b821ff9feac19426113cc641a2'

* commit '1482aff2048511b821ff9feac19426113cc641a2':
  lavc: Move noise_reduction to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agox86/imdct36: use extractps inside the STORE macro
James Almer [Thu, 28 Jan 2016 16:32:53 +0000 (13:32 -0300)]
x86/imdct36: use extractps inside the STORE macro

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Henrik Gramner <henrik@gramner.com>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agommaldec: limit internal buffering
wm4 [Thu, 28 Jan 2016 16:24:53 +0000 (17:24 +0100)]
mmaldec: limit internal buffering

This uses a new MMAL feature, which limits the number of extra frames
that can be buffered within the decoder. VIDEO_MAX_NUM_CALLBACKS can
be defined as positive or negative number. Positive numbers are
absolute, and can lead to deadlocks if the user underestimates the
number of required buffers. Negative numbers specify the number of extra
buffers, e.g. -1 means no extra buffer, (-1-N) means N extra buffers.

Set a gratuitous default of -11 (N=10). This is much lower than the
firmware default, which appears to be 96.

This is backwards compatible, but needs a symbol only present in newer
firmware headers. (It's an enum item, so it requires a check in
configure.)

4 years agommaldec: support MPEG-4
wm4 [Thu, 28 Jan 2016 16:24:40 +0000 (17:24 +0100)]
mmaldec: support MPEG-4

I guess this means part 2 in both cases. Not sure which profiles exactly
are actually supported properly.

4 years agommaldec: print the MMAL format FourCC automatically
wm4 [Thu, 28 Jan 2016 16:23:46 +0000 (17:23 +0100)]
mmaldec: print the MMAL format FourCC automatically

Slight simplification. The result is the same. Also, change the
wording of the message as requested in patch review.

4 years agoconfigure: fix mmal build dependencies
wm4 [Thu, 28 Jan 2016 16:23:23 +0000 (17:23 +0100)]
configure: fix mmal build dependencies

The mmal decoders do not depend on the software decoders.

4 years agosnow: Move scenechange_threshold to a private option
Derek Buitenhuis [Thu, 28 Jan 2016 15:36:06 +0000 (15:36 +0000)]
snow: Move scenechange_threshold to a private option

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '7c79587d7407dab4b9445d66b5f111fe657c8c4d'
Derek Buitenhuis [Thu, 28 Jan 2016 15:24:00 +0000 (15:24 +0000)]
Merge commit '7c79587d7407dab4b9445d66b5f111fe657c8c4d'

* commit '7c79587d7407dab4b9445d66b5f111fe657c8c4d':
  lavc: Move scenechange_threshold to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '5764d38173661c29d954711dd5abfddf709e9ba4'
Derek Buitenhuis [Thu, 28 Jan 2016 15:21:21 +0000 (15:21 +0000)]
Merge commit '5764d38173661c29d954711dd5abfddf709e9ba4'

* commit '5764d38173661c29d954711dd5abfddf709e9ba4':
  lavc: Move chromaoffset to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '0ac9f33a9e69c64eee592791be3c5441a6a3d6b7'
Derek Buitenhuis [Thu, 28 Jan 2016 15:08:10 +0000 (15:08 +0000)]
Merge commit '0ac9f33a9e69c64eee592791be3c5441a6a3d6b7'

* commit '0ac9f33a9e69c64eee592791be3c5441a6a3d6b7':
  lavc: Move frame_skip_* to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '84c4714f397c9c50eb9d49008cc1c08385f68f31'
Derek Buitenhuis [Thu, 28 Jan 2016 14:21:33 +0000 (14:21 +0000)]
Merge commit '84c4714f397c9c50eb9d49008cc1c08385f68f31'

* commit '84c4714f397c9c50eb9d49008cc1c08385f68f31':
  lavc: Move brd_scale to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoavcodec: add dvaudio parser
Paul B Mahol [Wed, 27 Jan 2016 13:37:09 +0000 (14:37 +0100)]
avcodec: add dvaudio parser

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agolavc/mjpegdec: use ptrdiff_t instead of ssize_t
Matthieu Bouron [Wed, 27 Jan 2016 20:59:14 +0000 (21:59 +0100)]
lavc/mjpegdec: use ptrdiff_t instead of ssize_t

Fixes build on msvc.

4 years agoavcodec/h264: Fix memleak in case of ff_h264_decode_extradata() failure
Michael Niedermayer [Thu, 28 Jan 2016 02:18:20 +0000 (03:18 +0100)]
avcodec/h264: Fix memleak in case of ff_h264_decode_extradata() failure

Fixes Ticket5139

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoqsvenc: Fix b_strategy typo
Derek Buitenhuis [Wed, 27 Jan 2016 23:49:41 +0000 (23:49 +0000)]
qsvenc: Fix b_strategy typo

This was introduced in 0e6c8532215790bbe560a9eea4f3cc82bb55cf92.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoFATE: update AAC encoder PNS test target
Rostislav Pehlivanov [Wed, 27 Jan 2016 23:55:24 +0000 (23:55 +0000)]
FATE: update AAC encoder PNS test target

Test target hasn't been updated with the latest changes.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agolibavcodec/util: Fix timebase overflow check
Derek Buitenhuis [Wed, 27 Jan 2016 21:12:04 +0000 (21:12 +0000)]
libavcodec/util: Fix timebase overflow check

It could accidentally divide by zero if num was zero.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoconfigure: fix openssl pkg-config check
James Almer [Wed, 27 Jan 2016 20:56:35 +0000 (17:56 -0300)]
configure: fix openssl pkg-config check

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoconfigure: Revert recent changes to disable-everything
Derek Buitenhuis [Wed, 27 Jan 2016 20:32:12 +0000 (20:32 +0000)]
configure: Revert recent changes to disable-everything

These will be re-merged once it's been fixed properly.

This reverts:
 * Commit '8e7bea6dc6ac5b21484774a026847bec0771ab62'
   configure: Improve requesting specific features
 * Commit 'e93aa2c9e7b3599aee6a5820760fc1a2c629dea0'
   configure: Force-enable select_any dependencies only on --enable

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoavcodec/version: Add missing #endif
Derek Buitenhuis [Wed, 27 Jan 2016 20:27:25 +0000 (20:27 +0000)]
avcodec/version: Add missing #endif

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'
Derek Buitenhuis [Wed, 27 Jan 2016 20:18:04 +0000 (20:18 +0000)]
Merge commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'

* commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'
  lavc: Move b_frame_strategy and b_sensitivity to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '55c7e5bf7c8d368c9bc60a219b04849ec9f4c84c'
Derek Buitenhuis [Wed, 27 Jan 2016 20:09:11 +0000 (20:09 +0000)]
Merge commit '55c7e5bf7c8d368c9bc60a219b04849ec9f4c84c'

This is a NOOP.

* commit '55c7e5bf7c8d368c9bc60a219b04849ec9f4c84c':
  riff: add C210 FourCC (Canopus C210)
  riff: add YUYV FourCC (Drastic YUYV)

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'd43a165bda0eae95f4c7a168c7d13d94966c1a09'
Derek Buitenhuis [Wed, 27 Jan 2016 20:06:01 +0000 (20:06 +0000)]
Merge commit 'd43a165bda0eae95f4c7a168c7d13d94966c1a09'

* commit 'd43a165bda0eae95f4c7a168c7d13d94966c1a09':
  imgconvert: Add the proper API guards to a deprecated function

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'f7168d7016f7d1034ec90223fa91a90711704e11'
Derek Buitenhuis [Wed, 27 Jan 2016 20:02:01 +0000 (20:02 +0000)]
Merge commit 'f7168d7016f7d1034ec90223fa91a90711704e11'

* commit 'f7168d7016f7d1034ec90223fa91a90711704e11':
  imgconvert: Move AVPicture-related static function to the deprecated section

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '892f037c55d86ce36f8705fbeab052189312a13e'
Derek Buitenhuis [Wed, 27 Jan 2016 19:58:35 +0000 (19:58 +0000)]
Merge commit '892f037c55d86ce36f8705fbeab052189312a13e'

* commit '892f037c55d86ce36f8705fbeab052189312a13e':
  imgconvert: Move the shrink functions only where needed

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '9d3ea5cbf57e30bf2717a9ce64e858dad8a02aa6'
Derek Buitenhuis [Wed, 27 Jan 2016 19:56:44 +0000 (19:56 +0000)]
Merge commit '9d3ea5cbf57e30bf2717a9ce64e858dad8a02aa6'

* commit '9d3ea5cbf57e30bf2717a9ce64e858dad8a02aa6':
  imgconvert: Drop outdated comment block

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'e93aa2c9e7b3599aee6a5820760fc1a2c629dea0'
Derek Buitenhuis [Wed, 27 Jan 2016 19:52:48 +0000 (19:52 +0000)]
Merge commit 'e93aa2c9e7b3599aee6a5820760fc1a2c629dea0'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '65d29dd274a302131e2e4bc6d2b1eca4a093900c'
Derek Buitenhuis [Wed, 27 Jan 2016 19:51:54 +0000 (19:51 +0000)]
Merge commit '65d29dd274a302131e2e4bc6d2b1eca4a093900c'

This is a NOOP.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '883ad2c59ceea1ced5495b5ccc83695ed4bbb94b'
Derek Buitenhuis [Wed, 27 Jan 2016 19:49:16 +0000 (19:49 +0000)]
Merge commit '883ad2c59ceea1ced5495b5ccc83695ed4bbb94b'

This is a NOOP.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '8e7bea6dc6ac5b21484774a026847bec0771ab62'
Derek Buitenhuis [Wed, 27 Jan 2016 19:48:09 +0000 (19:48 +0000)]
Merge commit '8e7bea6dc6ac5b21484774a026847bec0771ab62'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'e9175634ec96e36873929637491189150cfce9ec'
Derek Buitenhuis [Wed, 27 Jan 2016 19:41:36 +0000 (19:41 +0000)]
Merge commit 'e9175634ec96e36873929637491189150cfce9ec'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '472d488ebcc53bea4cdb124edb94558e72d8f23f'
Derek Buitenhuis [Wed, 27 Jan 2016 19:40:50 +0000 (19:40 +0000)]
Merge commit '472d488ebcc53bea4cdb124edb94558e72d8f23f'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '7486418683bd2477772e03aab573cf846c12fb0d'
Derek Buitenhuis [Wed, 27 Jan 2016 19:39:52 +0000 (19:39 +0000)]
Merge commit '7486418683bd2477772e03aab573cf846c12fb0d'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'e59708bb9d94f67381f19344b5e021591eb711bf'
Derek Buitenhuis [Wed, 27 Jan 2016 19:33:32 +0000 (19:33 +0000)]
Merge commit 'e59708bb9d94f67381f19344b5e021591eb711bf'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'c4de754d4dac5ddae4d5a6f02798c0f560771921'
Derek Buitenhuis [Wed, 27 Jan 2016 19:32:39 +0000 (19:32 +0000)]
Merge commit 'c4de754d4dac5ddae4d5a6f02798c0f560771921'

This is a NOOP.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '8fd361f53b3c17c1ae13a39e030c8fa3ab4d8f1f'
Derek Buitenhuis [Wed, 27 Jan 2016 19:30:08 +0000 (19:30 +0000)]
Merge commit '8fd361f53b3c17c1ae13a39e030c8fa3ab4d8f1f'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agolavc/mjpegdec: speed up scan data copy
Matthieu Bouron [Tue, 26 Jan 2016 16:15:37 +0000 (17:15 +0100)]
lavc/mjpegdec: speed up scan data copy

4 years agoMerge commit 'e4eb13ca77624401ea7cef1ed6ad8e2d13fd2063'
Derek Buitenhuis [Wed, 27 Jan 2016 18:32:28 +0000 (18:32 +0000)]
Merge commit 'e4eb13ca77624401ea7cef1ed6ad8e2d13fd2063'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '09f4822e4eaf61513b9092414450f3ae920ccd9d'
Derek Buitenhuis [Wed, 27 Jan 2016 18:29:21 +0000 (18:29 +0000)]
Merge commit '09f4822e4eaf61513b9092414450f3ae920ccd9d'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>