ffmpeg.git
3 years agoffmpeg_filter: Add missing pixel formats to strict_std_compliance case for ljpeg
Michael Niedermayer [Wed, 10 Feb 2016 11:28:12 +0000 (12:28 +0100)]
ffmpeg_filter: Add missing pixel formats to strict_std_compliance case for ljpeg

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffmpeg_filter: Add YUV 444 to strict_std_compliance case for mjpeg
Michael Niedermayer [Wed, 10 Feb 2016 11:28:12 +0000 (12:28 +0100)]
ffmpeg_filter: Add YUV 444 to strict_std_compliance case for mjpeg

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/f_metadata: fix few logic errors
Paul B Mahol [Wed, 10 Feb 2016 10:47:52 +0000 (11:47 +0100)]
avfilter/f_metadata: fix few logic errors

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agotests: Add test for proper header guard
Timothy Gu [Fri, 29 Jan 2016 02:33:06 +0000 (18:33 -0800)]
tests: Add test for proper header guard

Reviewed-by: Clément Bœsch <u@pkh.me>
3 years agoavfilter: add metadata filters
Paul B Mahol [Sat, 6 Feb 2016 10:19:45 +0000 (11:19 +0100)]
avfilter: add metadata filters

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/vf_nnedi: Fix memleak
Michael Niedermayer [Tue, 9 Feb 2016 12:02:40 +0000 (13:02 +0100)]
avfilter/vf_nnedi: Fix memleak

Fixes CID1351359

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agonut: Add PAL8 support
Michael Niedermayer [Mon, 8 Feb 2016 11:38:42 +0000 (12:38 +0100)]
nut: Add PAL8 support

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/dirac: Fix memleak of dsh on error
Michael Niedermayer [Tue, 9 Feb 2016 13:46:45 +0000 (14:46 +0100)]
avcodec/dirac: Fix memleak of dsh on error

Fixes CID1351360

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavf/mov: Extend extracting XMP in mov files using UUID Box
Thierry Foucu [Fri, 5 Feb 2016 23:39:25 +0000 (15:39 -0800)]
lavf/mov: Extend extracting XMP in mov files using UUID Box

The UUID is based on http://www.adobe.com/devnet/xmp.html

The patch is made according to XMP SPECIFICATION PART 3 - STORAGE IN
FILES See Table 8

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoconfigure: Enable GCC vectorization on ≥4.9 on x86
Timothy Gu [Sat, 30 Jan 2016 18:52:44 +0000 (10:52 -0800)]
configure: Enable GCC vectorization on ≥4.9 on x86

4.9 was released precisely nine years after the first GCC version with
autovectorizer (4.0) and six years after the first GCC version with
`-ftree-vectorize` default to enabled on `-O3` (4.3). We've given GCC
enough time to fix those bugs.

FATE passes here on a x86-64 machine with both GCC 4.9.2 and 5.3.1.

Some optimization hotspots benefit greatly from this change, especially
those without handwritten assembly. For instance, the main function in
vf_phase is now 1.6x faster (1.2x overall) on my machine.

3 years agoavfilter/af_agate: fix memleak of out frame
Michael Niedermayer [Mon, 8 Feb 2016 21:17:32 +0000 (22:17 +0100)]
avfilter/af_agate: fix memleak of out frame

Fixes CID1351358

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agovf_blend: Add SSE2 optimization for multiply
Timothy Gu [Mon, 8 Feb 2016 19:04:00 +0000 (19:04 +0000)]
vf_blend: Add SSE2 optimization for multiply

5 times faster than C, 3 times overall.

3 years agoffmpeg_opt: Fix memleaks in "manually set programs" loop
Michael Niedermayer [Mon, 8 Feb 2016 14:23:51 +0000 (15:23 +0100)]
ffmpeg_opt: Fix memleaks in "manually set programs" loop

Fixes CID1351356, CID1351357

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/vf_swaprect: add timeline support
Paul B Mahol [Mon, 8 Feb 2016 14:43:09 +0000 (15:43 +0100)]
avfilter/vf_swaprect: add timeline support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/af_anequalizer: Fix memleak of args
Michael Niedermayer [Sun, 7 Feb 2016 23:39:15 +0000 (00:39 +0100)]
avfilter/af_anequalizer: Fix memleak of args

Fixes CID1351355

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/vaf_spectrumsynth: Move "break" up
Michael Niedermayer [Sun, 7 Feb 2016 21:26:13 +0000 (22:26 +0100)]
avfilter/vaf_spectrumsynth: Move "break" up

Fixes CID1351347

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/af_aformat: remove deprecated syntax from options description
Paul B Mahol [Sun, 7 Feb 2016 21:47:39 +0000 (22:47 +0100)]
avfilter/af_aformat: remove deprecated syntax from options description

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agox86/cpu: set avxslow cpuflag on btver2 CPUs
James Almer [Sun, 7 Feb 2016 03:04:59 +0000 (00:04 -0300)]
x86/cpu: set avxslow cpuflag on btver2 CPUs

They are also slow when using 256 bit wide registers

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavfilter/vf_blend: add multiply128 mode
Paul B Mahol [Sun, 7 Feb 2016 18:24:49 +0000 (19:24 +0100)]
avfilter/vf_blend: add multiply128 mode

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agodiractab: Fix header guard name
Timothy Gu [Sun, 7 Feb 2016 17:26:15 +0000 (09:26 -0800)]
diractab: Fix header guard name

3 years agohuffyuvencdsp: Undefine "i" macro after each use
Timothy Gu [Mon, 2 Nov 2015 03:24:55 +0000 (19:24 -0800)]
huffyuvencdsp: Undefine "i" macro after each use

3 years agolibvpxenc: Allow setting tune parameter
Timothy Gu [Thu, 17 Dec 2015 03:53:14 +0000 (19:53 -0800)]
libvpxenc: Allow setting tune parameter

3 years agodiracdec: Pass DWTPlane to dwt init
Timothy Gu [Wed, 3 Feb 2016 01:30:55 +0000 (01:30 +0000)]
diracdec: Pass DWTPlane to dwt init

3 years agodiracdec: Split DWTPlane struct from Plane
Timothy Gu [Wed, 3 Feb 2016 01:18:29 +0000 (01:18 +0000)]
diracdec: Split DWTPlane struct from Plane

3 years agodirac_dwt: Rename init2 to init
Timothy Gu [Wed, 3 Feb 2016 01:02:39 +0000 (01:02 +0000)]
dirac_dwt: Rename init2 to init

The functions are all private.

3 years agodirac_dwt: Don't pass information in context as arguments
Timothy Gu [Wed, 3 Feb 2016 00:53:28 +0000 (00:53 +0000)]
dirac_dwt: Don't pass information in context as arguments

3 years agolavfi/fieldmatch: fix fields copy when plane height is odd
Clément Bœsch [Sun, 7 Feb 2016 14:49:20 +0000 (15:49 +0100)]
lavfi/fieldmatch: fix fields copy when plane height is odd

Fixes Ticket 5187

3 years agoavfilter: add swaprect filter
Paul B Mahol [Mon, 7 Dec 2015 15:45:52 +0000 (16:45 +0100)]
avfilter: add swaprect filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavcodec/utils: Add AV_PIX_FMT_GBRAP16?E to avcodec_align_dimensions2()
Michael Niedermayer [Sat, 6 Feb 2016 23:40:25 +0000 (00:40 +0100)]
avcodec/utils: Add AV_PIX_FMT_GBRAP16?E to avcodec_align_dimensions2()

Found-by: kierank
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/mp3enc: Assert that the header we assembled is valid
Michael Niedermayer [Wed, 3 Feb 2016 23:20:51 +0000 (00:20 +0100)]
avformat/mp3enc: Assert that the header we assembled is valid

Silences: CID1351343

The header is calculated by the code above the changed hunk, it is
thus asserted that the header is always correct.

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter: add streamselect and astreamselect filter
Paul B Mahol [Mon, 18 Jan 2016 10:22:32 +0000 (11:22 +0100)]
avfilter: add streamselect and astreamselect filter

Signed-off-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agobuild: use intermediate lcov coverage file
Andreas Cadhalpun [Tue, 2 Feb 2016 23:24:26 +0000 (00:24 +0100)]
build: use intermediate lcov coverage file

Otherwise the 'lcov -q --remove' run fails with the following error:
lcov: ERROR: cannot write to coverage.info!

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agobuild: fix lcov with src link
Andreas Cadhalpun [Tue, 2 Feb 2016 23:24:21 +0000 (00:24 +0100)]
build: fix lcov with src link

When out-of-tree builds now use a relative path, the '-b' option of lcov
is not needed, so just pass the current directory to it in this case.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agoconfigure: fall back to using full path if src is a directory
Andreas Cadhalpun [Tue, 26 Jan 2016 21:54:01 +0000 (22:54 +0100)]
configure: fall back to using full path if src is a directory

Or when building in-tree.
Also don't try to remove src on distclean in these cases.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agocmdutils: realign for some additional filters with very long name
Paul B Mahol [Fri, 5 Feb 2016 20:18:45 +0000 (21:18 +0100)]
cmdutils: realign for some additional filters with very long name

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agox86/dcadec: add ff_lfe_fir0_float_{sse,sse2,avx,fma3}
James Almer [Fri, 5 Feb 2016 19:45:04 +0000 (16:45 -0300)]
x86/dcadec: add ff_lfe_fir0_float_{sse,sse2,avx,fma3}

Up to ~4 times faster on x86_64, ~8 times on x86_32 if compiling using x87 fp math.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/dcadsp: rename lfe_fir_float functions
James Almer [Fri, 5 Feb 2016 14:41:39 +0000 (11:41 -0300)]
avcodec/dcadsp: rename lfe_fir_float functions

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agodirac_dwt: Make x86 files/functions names consistent
Timothy Gu [Wed, 3 Feb 2016 00:21:46 +0000 (00:21 +0000)]
dirac_dwt: Make x86 files/functions names consistent

3 years agodiracdsp: Make x86 files/functions names consistent
Timothy Gu [Tue, 2 Feb 2016 04:50:22 +0000 (20:50 -0800)]
diracdsp: Make x86 files/functions names consistent

3 years agolavc/dirac_dwt: fix building without asm
Michael Bradshaw [Sat, 6 Feb 2016 00:14:19 +0000 (01:14 +0100)]
lavc/dirac_dwt: fix building without asm

clang needs HAVE_MMX to be first in order to avoid an undefined
reference error.

3 years agoavcodec/h264: Fix segfault in 4:2:2 chroma deblock with 32-bit msvc
Henrik Gramner [Fri, 5 Feb 2016 20:01:49 +0000 (21:01 +0100)]
avcodec/h264: Fix segfault in 4:2:2 chroma deblock with 32-bit msvc

Using rNm and x86inc's stack allocation with a negative value at the same
time isn't supported, and caused the original stack pointer to be clobbered
when using a compiler that doesn't support stack alignment.

3 years agolavf/asfenc: add support for setting packet size
Marton Balint [Thu, 4 Feb 2016 00:30:31 +0000 (01:30 +0100)]
lavf/asfenc: add support for setting packet size

This can provide a manual workaround for ticket #4230.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agolavf/asfenc: add support for storing creation time
Marton Balint [Wed, 3 Feb 2016 21:49:35 +0000 (22:49 +0100)]
lavf/asfenc: add support for storing creation time

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agolavf/asfenc: add support for storing languages
Marton Balint [Wed, 3 Feb 2016 02:42:50 +0000 (03:42 +0100)]
lavf/asfenc: add support for storing languages

Checked compatiblity with VLC, Windows Media Player 12 and Windows Media ASF
Viewer 9 series.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agolavf/asfenc: check the number of streams in header
Marton Balint [Wed, 3 Feb 2016 21:53:56 +0000 (22:53 +0100)]
lavf/asfenc: check the number of streams in header

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agolavf/asfenc: add AVClass to context
Marton Balint [Wed, 3 Feb 2016 23:26:58 +0000 (00:26 +0100)]
lavf/asfenc: add AVClass to context

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoavfilter/split: support any channel count for asplit filter
Paul B Mahol [Fri, 5 Feb 2016 08:11:55 +0000 (09:11 +0100)]
avfilter/split: support any channel count for asplit filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavcodec/h264: mmxext 4:2:2 chroma deblock/loop filter
James Darnley [Wed, 13 Jan 2016 14:34:44 +0000 (14:34 +0000)]
avcodec/h264: mmxext 4:2:2 chroma deblock/loop filter

2.6 times faster (366 vs. 142 cycles)

3 years agolavc/rawdec: Use 16-byte line alignment for B1W0 and B0W1 video in nut
Mats Peterson [Fri, 5 Feb 2016 02:02:04 +0000 (03:02 +0100)]
lavc/rawdec: Use 16-byte line alignment for B1W0 and B0W1 video in nut

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/dcadsp: replace intptr_t with ptrdiff_t
James Almer [Fri, 5 Feb 2016 14:17:04 +0000 (11:17 -0300)]
avcodec/dcadsp: replace intptr_t with ptrdiff_t

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agox11grab: fixed next frame capture time calculation
Trevor \\\\ Higgins [Wed, 3 Feb 2016 14:10:01 +0000 (09:10 -0500)]
x11grab: fixed next frame capture time calculation

The next frame time could slip, causing the frame rate to drop until
 frames were dropped. Now will capture at the next correct moment instead.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/mov: dont print frma warning when format is the same
Eran Kornblau [Thu, 4 Feb 2016 13:31:25 +0000 (15:31 +0200)]
avformat/mov: dont print frma warning when format is the same

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/af_apulsator: assert that pathes leaving uninitialized variables do not...
Michael Niedermayer [Thu, 4 Feb 2016 00:49:15 +0000 (01:49 +0100)]
avfilter/af_apulsator: assert that pathes leaving uninitialized variables do not occur

Fixes: CID1341581, CID1341582

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agofate: fix fate-aac-pns-encode failures on non-sse x86_32 targets
James Almer [Thu, 4 Feb 2016 17:35:26 +0000 (14:35 -0300)]
fate: fix fate-aac-pns-encode failures on non-sse x86_32 targets

Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavfilter/vf_stack: free input pads name on uninit
Paul B Mahol [Thu, 4 Feb 2016 17:02:29 +0000 (18:02 +0100)]
avfilter/vf_stack: free input pads name on uninit

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agolavf/isom: Add more code points for H264.
Carl Eugen Hoyos [Thu, 4 Feb 2016 16:40:06 +0000 (17:40 +0100)]
lavf/isom: Add more code points for H264.

Defined by the MP4 registration authority.
Fixes ticket #5217.

3 years agoavfilter/af_afftfilt: Set last_expr to the default
Michael Niedermayer [Thu, 4 Feb 2016 13:04:43 +0000 (14:04 +0100)]
avfilter/af_afftfilt: Set last_expr to the default

This fixes a null pointer dereferece
Fixes: CID1351346

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodca_parser: ensure frame duration matches the actual sample rate
Hendrik Leppkes [Wed, 3 Feb 2016 11:43:44 +0000 (12:43 +0100)]
dca_parser: ensure frame duration matches the actual sample rate

The parser only parses the core, and thus has a duration relative
to the core sample rate only, not the actual stream sample rate.

FATE references changed due to now correct timestamps.

3 years agox86/emms: empty the mmx state unconditionally on supported targets
James Almer [Thu, 4 Feb 2016 04:49:01 +0000 (01:49 -0300)]
x86/emms: empty the mmx state unconditionally on supported targets

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/libutvideoenc: Add NULL termintor to options
Michael Niedermayer [Thu, 4 Feb 2016 01:17:57 +0000 (02:17 +0100)]
avcodec/libutvideoenc: Add NULL termintor to options

Fixes segfaults

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoswscale/swscale-test: Check av_image_fill_linesizes() for failure
Michael Niedermayer [Wed, 3 Feb 2016 23:40:42 +0000 (00:40 +0100)]
swscale/swscale-test: Check av_image_fill_linesizes() for failure

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavutil/aes_crt: free AVAESCTR struct properly
James Almer [Wed, 3 Feb 2016 22:25:45 +0000 (19:25 -0300)]
avutil/aes_crt: free AVAESCTR struct properly

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agomjpegenc: Remove duplicate initializer
Derek Buitenhuis [Wed, 3 Feb 2016 22:14:27 +0000 (22:14 +0000)]
mjpegenc: Remove duplicate initializer

This was causing c99conv to crash.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agolibutvideo: Unbreak
Derek Buitenhuis [Wed, 3 Feb 2016 19:27:24 +0000 (19:27 +0000)]
libutvideo: Unbreak

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agodiradec: split tables away to a separate diractab file
Rostislav Pehlivanov [Tue, 2 Feb 2016 14:24:57 +0000 (14:24 +0000)]
diradec: split tables away to a separate diractab file

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agodiracdec: move the MAX_DWT_LEVELS macro to dirac.h
Rostislav Pehlivanov [Tue, 2 Feb 2016 12:35:28 +0000 (12:35 +0000)]
diracdec: move the MAX_DWT_LEVELS macro to dirac.h

Used by the VC-2 encoder.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agoMerge commit '68395f8c99393c281a08139d20a7a04398b2fd04'
Derek Buitenhuis [Wed, 3 Feb 2016 17:13:56 +0000 (17:13 +0000)]
Merge commit '68395f8c99393c281a08139d20a7a04398b2fd04'

* commit '68395f8c99393c281a08139d20a7a04398b2fd04':
  qsvenc: fix a typo

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'cc602061ee860b041013397e27a036b85cd87b09'
Derek Buitenhuis [Wed, 3 Feb 2016 17:12:32 +0000 (17:12 +0000)]
Merge commit 'cc602061ee860b041013397e27a036b85cd87b09'

* commit 'cc602061ee860b041013397e27a036b85cd87b09':
  x86inc: Add debug symbols indicating sizes of compiled functions

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '002c47798da0c43a053822c8041144798d49ed84'
Derek Buitenhuis [Wed, 3 Feb 2016 17:07:47 +0000 (17:07 +0000)]
Merge commit '002c47798da0c43a053822c8041144798d49ed84'

This is a NOOP.

* commit '002c47798da0c43a053822c8041144798d49ed84':
  x86inc: Avoid creating unnecessary local labels
  x86inc: Simplify AUTO_REP_RET
  x86inc: Use more consistent indentation
  x86inc: Preserve arguments when allocating stack space
  x86inc: Improve FMA instruction handling
  x86inc: Be more verbose in assertion failures
  x86inc: Make cpuflag() and notcpuflag() return 0 or 1

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'd336bfcf69fee159e9dba5e5e486ddb1aba61aab'
Derek Buitenhuis [Wed, 3 Feb 2016 16:59:06 +0000 (16:59 +0000)]
Merge commit 'd336bfcf69fee159e9dba5e5e486ddb1aba61aab'

* commit 'd336bfcf69fee159e9dba5e5e486ddb1aba61aab':
  pixdesc: fix and extend doxy for av_pix_fmt_get_chroma_sub_sample()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'c0c4d7a0a556ec66e3068d36a883e84d1efb0690'
Derek Buitenhuis [Wed, 3 Feb 2016 16:57:46 +0000 (16:57 +0000)]
Merge commit 'c0c4d7a0a556ec66e3068d36a883e84d1efb0690'

* commit 'c0c4d7a0a556ec66e3068d36a883e84d1efb0690':
  configure: Correctly add openssl cflags and libs

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '87a814fdce522d45aa31aa258cb5514d7e754bff'
Derek Buitenhuis [Wed, 3 Feb 2016 16:57:07 +0000 (16:57 +0000)]
Merge commit '87a814fdce522d45aa31aa258cb5514d7e754bff'

* commit '87a814fdce522d45aa31aa258cb5514d7e754bff':
  libavcodec: Add missing AVClass pointers

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '0e9c4fe254073b209970df3e3cb84531bc388e99'
Derek Buitenhuis [Wed, 3 Feb 2016 16:54:20 +0000 (16:54 +0000)]
Merge commit '0e9c4fe254073b209970df3e3cb84531bc388e99'

* commit '0e9c4fe254073b209970df3e3cb84531bc388e99':
  lavc: Move pre_me to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '5b6f42da98c26a8aee8d2c2edfcbd0633ad1c607'
Derek Buitenhuis [Wed, 3 Feb 2016 16:53:13 +0000 (16:53 +0000)]
Merge commit '5b6f42da98c26a8aee8d2c2edfcbd0633ad1c607'

* commit '5b6f42da98c26a8aee8d2c2edfcbd0633ad1c607':
  lavc: Move me_penalty_compensation to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '2862b63783b5556f7f3fb2d097629bc6879f833a'
Derek Buitenhuis [Wed, 3 Feb 2016 16:49:19 +0000 (16:49 +0000)]
Merge commit '2862b63783b5556f7f3fb2d097629bc6879f833a'

* commit '2862b63783b5556f7f3fb2d097629bc6879f833a':
  lavc: Move prediction_method to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoavfilter/af_sidechaincompress: Free out frame on error
Michael Niedermayer [Wed, 3 Feb 2016 16:09:24 +0000 (17:09 +0100)]
avfilter/af_sidechaincompress: Free out frame on error

Fix memleak
Fixes CID1197065 part 2

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/utils: Check the return code of av_image_fill_linesizes()
Michael Niedermayer [Wed, 3 Feb 2016 14:50:17 +0000 (15:50 +0100)]
avcodec/utils: Check the return code of av_image_fill_linesizes()

Fixes CID1271741

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/http: add crypto to default whitlist to get encrypted HLS working again
Schenk, Michael [Wed, 3 Feb 2016 13:18:15 +0000 (13:18 +0000)]
avformat/http: add crypto to default whitlist to get encrypted HLS working  again

I think we missed the crypto in the default_whitelist in case of http. Otherwise encrypted HLS will fail with

[hls,applehttp @ 0x2af39c00] playlist[0] open_input [http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes-audio=65000-video=236000-14.ts], start_seq_no [1], cur_seq_no [14]

[hls,applehttp @ 0x2af39c00]    open_input curseqno [14] startseqno [1]

[hls,applehttp @ 0x2af39c00] HLS request for url 'http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes-audio=65000-video=236000-14.ts', offset 0, playlist 0

[NULL @ 0x2af3a200] KEY_AES_128 seg->key [http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans.key] pls->key_url [http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans.key]

[hls,applehttp @ 0x2af39c00]     open_input [KEY_AES_128]

[hls,applehttp @ 0x2af39c00]      : c->persistence [0]

[hls,applehttp @ 0x2af39c00]      : c->probing     [1]

[hls,applehttp @ 0x2af39c00]      : pls->input     [NULL]

[hls,applehttp @ 0x2af39c00]        using normal http path for URL [crypto+http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes-audio=65000-video=236000-14.ts]

[crypto @ 0x2aff7cc0] Protocol not on whitelist 'http,https,tls,rtp,tcp,udp!

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodoc/demuxers: add some concat demuxer script examples
Tobias Rapp [Tue, 26 Jan 2016 08:02:51 +0000 (09:02 +0100)]
doc/demuxers: add some concat demuxer script examples

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
3 years agoavfilter/vf_nnedi: fix ISO C90 warnings
Paul B Mahol [Wed, 3 Feb 2016 08:38:11 +0000 (09:38 +0100)]
avfilter/vf_nnedi: fix ISO C90 warnings

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agocinepakenc: Stop using AVPicture
Timothy Gu [Tue, 2 Feb 2016 02:44:55 +0000 (18:44 -0800)]
cinepakenc: Stop using AVPicture

3 years agoxv: Remove AVPicture usage
Timothy Gu [Tue, 2 Feb 2016 01:26:10 +0000 (17:26 -0800)]
xv: Remove AVPicture usage

3 years agosdl: Remove AVPicture usage
Timothy Gu [Tue, 2 Feb 2016 01:25:38 +0000 (17:25 -0800)]
sdl: Remove AVPicture usage

3 years agocfhd: fix off-by-one error in level check
Andreas Cadhalpun [Tue, 2 Feb 2016 23:55:18 +0000 (00:55 +0100)]
cfhd: fix off-by-one error in level check

This fixes out-of-bounds writes causing segmentation faults.

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3 years agodecklink: support all valid numbers of audio channels
Matthias Hunstock [Sun, 20 Dec 2015 11:57:32 +0000 (11:57 +0000)]
decklink: support all valid numbers of audio channels

As it is already written in the documentation, BMD DeckLink cards
are capable of capturing 2, 8 or 16 audio channels (for SDI Inputs).
Currently the value is hardcoded to 2. Introduces new option.

Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agodca: add emms_c after usage of AV_COPY128
Hendrik Leppkes [Tue, 2 Feb 2016 22:27:30 +0000 (23:27 +0100)]
dca: add emms_c after usage of AV_COPY128

Similar to AV_ZERO128, AV_COPY128 can use MMX instructions in x86

3 years agodca: add emms_c after AV_ZERO128 macros
Hendrik Leppkes [Tue, 2 Feb 2016 19:03:11 +0000 (20:03 +0100)]
dca: add emms_c after AV_ZERO128 macros

AV_ZERO64/128 can use MMX on x86.

Reviewed-By: James Almer <jamrial@gmail.com>
3 years agodca: add new fate tests based on the dcadec-samples test suite
Hendrik Leppkes [Mon, 1 Feb 2016 23:46:01 +0000 (00:46 +0100)]
dca: add new fate tests based on the dcadec-samples test suite

3 years agodca: split decoder fate tests into dca.mak
Hendrik Leppkes [Mon, 1 Feb 2016 20:17:53 +0000 (21:17 +0100)]
dca: split decoder fate tests into dca.mak

3 years agoavformat: add windows.h to SChannel SSP TLS code
Kevin Mitchell [Wed, 25 Nov 2015 03:25:12 +0000 (19:25 -0800)]
avformat: add windows.h to SChannel SSP TLS code

This fixes building on cygwin
Fixes ticket #5036

3 years agoavformat/tls_securetransport: Add missing include
Michael Niedermayer [Tue, 2 Feb 2016 14:57:32 +0000 (15:57 +0100)]
avformat/tls_securetransport: Add missing include

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodiracdsp_mmx: Fix some more indentations
Timothy Gu [Tue, 2 Feb 2016 04:47:56 +0000 (20:47 -0800)]
diracdsp_mmx: Fix some more indentations

3 years agodiracdsp_mmx: Fix indentation
Timothy Gu [Tue, 2 Feb 2016 04:40:55 +0000 (20:40 -0800)]
diracdsp_mmx: Fix indentation

3 years agoUpdate demuxers and protocols for protocol whitelist support
Michael Niedermayer [Sat, 30 Jan 2016 01:17:51 +0000 (02:17 +0100)]
Update demuxers and protocols for protocol whitelist support

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat: add protocol_whitelist
Michael Niedermayer [Sat, 30 Jan 2016 01:17:50 +0000 (02:17 +0100)]
avformat: add protocol_whitelist

Note to maintainers: update tools

Note to maintainers: set a default whitelist for your protocol
If that makes no sense then consider to set "none" and thus require the user to specify a white-list
for sub-protocols to be opened

Note, testing and checking for missing changes is needed

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agox86: vc1dsp: Convert vc1_inv_trans_*_dc to NASM format
Timothy Gu [Sun, 31 Jan 2016 19:42:24 +0000 (11:42 -0800)]
x86: vc1dsp: Convert vc1_inv_trans_*_dc to NASM format

3 years agoffprobe: Deprecate stream timecode field and add frame side data timecode field
Derek Buitenhuis [Sun, 31 Jan 2016 14:33:06 +0000 (14:33 +0000)]
ffprobe: Deprecate stream timecode field and add frame side data timecode field

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agompeg12dec: Export GOP timecodes as side data
Derek Buitenhuis [Sun, 31 Jan 2016 14:32:39 +0000 (14:32 +0000)]
mpeg12dec: Export GOP timecodes as side data

The codec context field was rightly deprecated, and the data
may change per-frame.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoavutil: Add GOP timecode frame side data
Derek Buitenhuis [Sun, 31 Jan 2016 13:10:38 +0000 (13:10 +0000)]
avutil: Add GOP timecode frame side data

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoRevert "do not write f2 if not interlaced"
Sebastian Dröge [Fri, 29 Jan 2016 16:45:05 +0000 (17:45 +0100)]
Revert "do not write f2 if not interlaced"

This reverts commit 8ed82d8174a666f80ab8834e3617cbe91ae740a9.

SMPTE S377-1-2009c defines in F.4.1 that the Video Line Map should
always be an array with two 32 bit integers as elements. This is
repeated in G.2.12 with actual examples for progressive content,
where the second value would always be 0.

Additionally, the IRT MXF analyser also lists this as the only
error in the MXF output from ffmpeg: https://mxf-analyser-cloud.irt.de

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>