ffmpeg.git
4 years agoMerge commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf'
Michael Niedermayer [Mon, 27 Jul 2015 22:13:51 +0000 (00:13 +0200)]
Merge commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf'

* commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf':
  asfdec: do not align Data Object when Broadcast Flag is set

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'db21dde3f72c2331653399bdb8745350f015d847'
Michael Niedermayer [Mon, 27 Jul 2015 22:13:14 +0000 (00:13 +0200)]
Merge commit 'db21dde3f72c2331653399bdb8745350f015d847'

* commit 'db21dde3f72c2331653399bdb8745350f015d847':
  qsvdec_mpeg2: drop an incorrect comment

Conflicts:
libavcodec/qsvdec_mpeg2.c

No change as the removed comment was not in libavcodec/qsvdec_mpeg2.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'abdc7e403e003e97a0dcc4499ac319bf854aeead'
Michael Niedermayer [Mon, 27 Jul 2015 22:04:02 +0000 (00:04 +0200)]
Merge commit 'abdc7e403e003e97a0dcc4499ac319bf854aeead'

* commit 'abdc7e403e003e97a0dcc4499ac319bf854aeead':
  fate: Add hap-chunk ref file

Conflicts:
tests/ref/fate/hap-chunk

See: c7e6443441ed5c1b5f64067dfbf4956bc2c6acbb
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'aaf937ee3557bfb99c2ad298591b22a7f22ecbf7'
Michael Niedermayer [Mon, 27 Jul 2015 22:02:37 +0000 (00:02 +0200)]
Merge commit 'aaf937ee3557bfb99c2ad298591b22a7f22ecbf7'

* commit 'aaf937ee3557bfb99c2ad298591b22a7f22ecbf7':
  hap: Add utility functions file

Conflicts:
libavcodec/hap.c

No change, no files are/where missing in FFmpeg

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '3ee217853a6741b829a2683f49c590618891b1ab'
Michael Niedermayer [Mon, 27 Jul 2015 21:47:01 +0000 (23:47 +0200)]
Merge commit '3ee217853a6741b829a2683f49c590618891b1ab'

* commit '3ee217853a6741b829a2683f49c590618891b1ab':
  Support the Hap chunked frame format

Conflicts:
libavcodec/hap.h
libavcodec/hapdec.c
libavcodec/version.h

See: c7e6443441ed5c1b5f64067dfbf4956bc2c6acbb
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '43dd004747fa697396b47d034a80e069facbea09'
Michael Niedermayer [Mon, 27 Jul 2015 21:36:37 +0000 (23:36 +0200)]
Merge commit '43dd004747fa697396b47d034a80e069facbea09'

* commit '43dd004747fa697396b47d034a80e069facbea09':
  hap: Move some per-stream setup into decoder init rather than per-frame

Conflicts:
libavcodec/hapdec.c

See: 6074956fa1d2617ac602e49931b06df0a751370e
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'b94ec30428b9696f99b08055735689623fe63954'
Michael Niedermayer [Mon, 27 Jul 2015 21:21:23 +0000 (23:21 +0200)]
Merge commit 'b94ec30428b9696f99b08055735689623fe63954'

* commit 'b94ec30428b9696f99b08055735689623fe63954':
  lavc: Update version and APIchanges

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'
Michael Niedermayer [Mon, 27 Jul 2015 20:53:16 +0000 (22:53 +0200)]
Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'

* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba':
  lavc: Consistently prefix input buffer defines

Conflicts:
doc/examples/decoding_encoding.c
libavcodec/4xm.c
libavcodec/aac_adtstoasc_bsf.c
libavcodec/aacdec.c
libavcodec/aacenc.c
libavcodec/ac3dec.h
libavcodec/asvenc.c
libavcodec/avcodec.h
libavcodec/avpacket.c
libavcodec/dvdec.c
libavcodec/ffv1enc.c
libavcodec/g2meet.c
libavcodec/gif.c
libavcodec/h264.c
libavcodec/h264_mp4toannexb_bsf.c
libavcodec/huffyuvdec.c
libavcodec/huffyuvenc.c
libavcodec/jpeglsenc.c
libavcodec/libxvid.c
libavcodec/mdec.c
libavcodec/motionpixels.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/noise_bsf.c
libavcodec/nuv.c
libavcodec/nvenc.c
libavcodec/options.c
libavcodec/parser.c
libavcodec/pngenc.c
libavcodec/proresenc_kostya.c
libavcodec/qsvdec.c
libavcodec/svq1enc.c
libavcodec/tiffenc.c
libavcodec/truemotion2.c
libavcodec/utils.c
libavcodec/utvideoenc.c
libavcodec/vc1dec.c
libavcodec/wmalosslessdec.c
libavformat/adxdec.c
libavformat/aiffdec.c
libavformat/apc.c
libavformat/apetag.c
libavformat/avidec.c
libavformat/bink.c
libavformat/cafdec.c
libavformat/flvdec.c
libavformat/id3v2.c
libavformat/isom.c
libavformat/matroskadec.c
libavformat/mov.c
libavformat/mpc.c
libavformat/mpc8.c
libavformat/mpegts.c
libavformat/mvi.c
libavformat/mxfdec.c
libavformat/mxg.c
libavformat/nutdec.c
libavformat/oggdec.c
libavformat/oggparsecelt.c
libavformat/oggparseflac.c
libavformat/oggparseopus.c
libavformat/oggparsespeex.c
libavformat/omadec.c
libavformat/rawdec.c
libavformat/riffdec.c
libavformat/rl2.c
libavformat/rmdec.c
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_qdm2.c
libavformat/rtpdec_svq3.c
libavformat/sierravmd.c
libavformat/smacker.c
libavformat/smush.c
libavformat/spdifenc.c
libavformat/takdec.c
libavformat/tta.c
libavformat/utils.c
libavformat/vqf.c
libavformat/westwood_vqa.c
libavformat/xmv.c
libavformat/xwma.c
libavformat/yop.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'def97856de6021965db86c25a732d78689bd6bb0'
Michael Niedermayer [Mon, 27 Jul 2015 20:21:19 +0000 (22:21 +0200)]
Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'

* commit 'def97856de6021965db86c25a732d78689bd6bb0':
  lavc: AV-prefix all codec capabilities

Conflicts:
cmdutils.c
ffmpeg.c
ffplay.c
libavcodec/8svx.c
libavcodec/aacenc.c
libavcodec/ac3dec.c
libavcodec/adpcm.c
libavcodec/alac.c
libavcodec/atrac3plusdec.c
libavcodec/bink.c
libavcodec/dnxhddec.c
libavcodec/dvdec.c
libavcodec/dvenc.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/fic.c
libavcodec/flacdec.c
libavcodec/flacenc.c
libavcodec/flvdec.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/gifdec.c
libavcodec/h261dec.c
libavcodec/hevc.c
libavcodec/iff.c
libavcodec/imc.c
libavcodec/libopenjpegdec.c
libavcodec/libvo-aacenc.c
libavcodec/libvorbisenc.c
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c
libavcodec/libx264.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mpegaudiodec_float.c
libavcodec/msmpeg4dec.c
libavcodec/mxpegdec.c
libavcodec/nvenc_h264.c
libavcodec/nvenc_hevc.c
libavcodec/pngdec.c
libavcodec/qpeg.c
libavcodec/ra288.c
libavcodec/rv10.c
libavcodec/s302m.c
libavcodec/sp5xdec.c
libavcodec/takdec.c
libavcodec/tiff.c
libavcodec/tta.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/vp6.c
libavcodec/vp9.c
libavcodec/wavpack.c
libavcodec/yop.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'
Michael Niedermayer [Mon, 27 Jul 2015 19:14:31 +0000 (21:14 +0200)]
Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'

* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615':
  lavc: AV-prefix all codec flags

Conflicts:
doc/examples/muxing.c
ffmpeg.c
ffmpeg_opt.c
ffplay.c
libavcodec/aacdec.c
libavcodec/aacenc.c
libavcodec/ac3dec.c
libavcodec/ac3enc_float.c
libavcodec/atrac1.c
libavcodec/atrac3.c
libavcodec/atrac3plusdec.c
libavcodec/dcadec.c
libavcodec/ffv1enc.c
libavcodec/h264.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mb.c
libavcodec/imc.c
libavcodec/libmp3lame.c
libavcodec/libtheoraenc.c
libavcodec/libtwolame.c
libavcodec/libvpxenc.c
libavcodec/libxavs.c
libavcodec/libxvid.c
libavcodec/mpeg12dec.c
libavcodec/mpeg12enc.c
libavcodec/mpegaudiodec_template.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/nellymoserdec.c
libavcodec/nellymoserenc.c
libavcodec/nvenc.c
libavcodec/on2avc.c
libavcodec/options_table.h
libavcodec/opus_celt.c
libavcodec/pngenc.c
libavcodec/ra288.c
libavcodec/ratecontrol.c
libavcodec/twinvq.c
libavcodec/vc1_block.c
libavcodec/vc1_loopfilter.c
libavcodec/vc1_mc.c
libavcodec/vc1dec.c
libavcodec/vorbisdec.c
libavcodec/vp3.c
libavcodec/wma.c
libavcodec/wmaprodec.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/me_cmp_init.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoasfdec: do not align Data Object when Broadcast Flag is set
Alexandra Hájková [Thu, 23 Jul 2015 10:33:37 +0000 (12:33 +0200)]
asfdec: do not align Data Object when Broadcast Flag is set

its size is invalid in this case

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoqsvdec_mpeg2: drop an incorrect comment
Anton Khirnov [Mon, 27 Jul 2015 06:01:09 +0000 (08:01 +0200)]
qsvdec_mpeg2: drop an incorrect comment

It got copypasted from the h264 decoder, but it does not apply to mpeg2.

4 years agofate: Add hap-chunk ref file
Vittorio Giovara [Mon, 27 Jul 2015 15:56:12 +0000 (16:56 +0100)]
fate: Add hap-chunk ref file

Missing from the push of 3ee217853a6741b829a2683f49c590618891b1ab.

4 years agohap: Add utility functions file
Vittorio Giovara [Mon, 27 Jul 2015 15:20:29 +0000 (16:20 +0100)]
hap: Add utility functions file

Missing from the push of 3ee217853a6741b829a2683f49c590618891b1ab.

4 years agoSupport the Hap chunked frame format
Tom Butterworth [Thu, 23 Jul 2015 18:39:29 +0000 (14:39 -0400)]
Support the Hap chunked frame format

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agohap: Move some per-stream setup into decoder init rather than per-frame
Tom Butterworth [Thu, 23 Jul 2015 18:37:08 +0000 (14:37 -0400)]
hap: Move some per-stream setup into decoder init rather than per-frame

This change will reject frames with a texture type which does not match
the stream description.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agolavc: Update version and APIchanges
Vittorio Giovara [Thu, 2 Jul 2015 23:50:54 +0000 (00:50 +0100)]
lavc: Update version and APIchanges

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agolavc: Consistently prefix input buffer defines
Vittorio Giovara [Mon, 29 Jun 2015 21:48:34 +0000 (23:48 +0200)]
lavc: Consistently prefix input buffer defines

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agolavc: AV-prefix all codec capabilities
Vittorio Giovara [Tue, 7 Jul 2015 00:41:27 +0000 (01:41 +0100)]
lavc: AV-prefix all codec capabilities

Express bitfields more simply.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agolavc: AV-prefix all codec flags
Vittorio Giovara [Mon, 29 Jun 2015 19:59:37 +0000 (21:59 +0200)]
lavc: AV-prefix all codec flags

Convert doxygen to multiline and express bitfields more simply.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agolavc: Deprecate avctx.me_method
Vittorio Giovara [Tue, 7 Jul 2015 00:20:43 +0000 (01:20 +0100)]
lavc: Deprecate avctx.me_method

This option is extremely codec specific and only a few codecs employ it.
Move it to codec private options instead: mpegenc family supports only 3
values, xavs and x264 use 5, and xvid has a different metric entirely.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agowmv2enc: Check memory allocation
Vittorio Giovara [Fri, 24 Jul 2015 03:24:33 +0000 (04:24 +0100)]
wmv2enc: Check memory allocation

4 years agoac3enc_template: Use the correct context field
Vittorio Giovara [Fri, 24 Jul 2015 04:17:26 +0000 (05:17 +0100)]
ac3enc_template: Use the correct context field

For audio encoders, delay has no effect, use the appropriate one,
initial_padding (see 2df0c32).

4 years agoconfigure: Check for _M_ARMT to detect thumb when using MSVC
Martin Storsjö [Fri, 24 Jul 2015 20:29:17 +0000 (23:29 +0300)]
configure: Check for _M_ARMT to detect thumb when using MSVC

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoconfigure: Check MSVC defines for identifying hardfloat
Martin Storsjö [Fri, 24 Jul 2015 20:25:10 +0000 (23:25 +0300)]
configure: Check MSVC defines for identifying hardfloat

This macro identifies whether VFPv3 is available; MSVC defaults
to hardfloat (except for older MSVC versions for CE, targeting
ARMv4).

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoconfigure: Default to armasm for --toolchain=msvc when targeting arm
Martin Storsjö [Fri, 24 Jul 2015 20:23:29 +0000 (23:23 +0300)]
configure: Default to armasm for --toolchain=msvc when targeting arm

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoconfigure: Simplify, remove an unnecessary intermediate variable
Martin Storsjö [Mon, 27 Jul 2015 06:40:28 +0000 (09:40 +0300)]
configure: Simplify, remove an unnecessary intermediate variable

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agodoc: Remove the now unnecessary remark about PATH and link.exe
Martin Storsjö [Sun, 26 Jul 2015 17:23:30 +0000 (20:23 +0300)]
doc: Remove the now unnecessary remark about PATH and link.exe

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoasfdec: interpret the first flag in an asf packet as length flag
Alexandra Hájková [Fri, 24 Jul 2015 09:22:56 +0000 (11:22 +0200)]
asfdec: interpret the first flag in an asf packet as length flag

if the error correction flag is not set, a packet starts with payload

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agocheckasm: Modify report format
Henrik Gramner [Fri, 24 Jul 2015 21:46:20 +0000 (23:46 +0200)]
checkasm: Modify report format

Makes it a bit more clear where each test belongs.

Suggested by Anton Khirnov.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoqsvdec_*: add missing CODEC_CAP_DR1
Anton Khirnov [Sat, 25 Jul 2015 16:03:35 +0000 (18:03 +0200)]
qsvdec_*: add missing CODEC_CAP_DR1

4 years agoavfilter: add acrossfade filter
Paul B Mahol [Thu, 23 Jul 2015 22:13:17 +0000 (22:13 +0000)]
avfilter: add acrossfade filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoMerge commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6'
Michael Niedermayer [Mon, 27 Jul 2015 19:03:20 +0000 (21:03 +0200)]
Merge commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6'

* commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6':
  lavc: Deprecate avctx.me_method

Conflicts:
doc/encoders.texi
libavcodec/avcodec.h
libavcodec/libx264.c
libavcodec/motion_est.c
libavcodec/options_table.h
libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '03eb55741427c6608f63972c105e565ca0ba4f15'
Michael Niedermayer [Mon, 27 Jul 2015 18:42:09 +0000 (20:42 +0200)]
Merge commit '03eb55741427c6608f63972c105e565ca0ba4f15'

* commit '03eb55741427c6608f63972c105e565ca0ba4f15':
  wmv2enc: Check memory allocation

Conflicts:
libavcodec/wmv2enc.c

See: 6e8fe448154e1aa0928cb0d2e1aecb7255c751cc
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'a67b67944aa9e6e794934d15f9fd9a9cf7173e09'
Michael Niedermayer [Mon, 27 Jul 2015 18:32:41 +0000 (20:32 +0200)]
Merge commit 'a67b67944aa9e6e794934d15f9fd9a9cf7173e09'

* commit 'a67b67944aa9e6e794934d15f9fd9a9cf7173e09':
  ac3enc_template: Use the correct context field

See: 320ce9f284171f8c8d8561cccd2186c27f24898c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/v410enc: do not use internal->byte_buffer
Michael Niedermayer [Sun, 5 Jul 2015 19:13:04 +0000 (21:13 +0200)]
avcodec/v410enc: do not use internal->byte_buffer

it is not optimal when the buffer size is well known at allocation time

This avoids a memcpy()

about 1% faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/utils: do not use internal->byte_buffer when little downsizing is expected
Michael Niedermayer [Mon, 27 Jul 2015 18:01:59 +0000 (20:01 +0200)]
avcodec/utils: do not use internal->byte_buffer when little downsizing is expected

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/internal: Deprecate ff_alloc_packet() in favor of ff_alloc_packet2()
Michael Niedermayer [Mon, 6 Jul 2015 09:33:01 +0000 (11:33 +0200)]
avcodec/internal: Deprecate ff_alloc_packet() in favor of ff_alloc_packet2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec: Add a min size parameter to ff_alloc_packet2()
Michael Niedermayer [Mon, 27 Jul 2015 17:36:16 +0000 (19:36 +0200)]
avcodec: Add a min size parameter to  ff_alloc_packet2()

This parameter can be used to inform the allocation code about how much
downsizing might occur, and can be used to optimize how to allocate the
packet

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoAAC Encoder: clipping avoidance
Claudio Freire [Tue, 21 Jul 2015 01:53:24 +0000 (22:53 -0300)]
AAC Encoder: clipping avoidance

Avoid clipping due to quantization noise to produce audible
artifacts, by detecting near-clipping signals and both attenuating
them a little and encoding escape-encoded bands (usually the
loudest) rounding towards zero instead of nearest, which tends to
decrease overall energy and thus clipping.

Currently fate tests measure numerical error so this change makes
tests using asynth (which are near clipping) report higher error
not less, because of window attenuation. Yet, they sound better,
not worse (albeit subtle, other samples aren't subtle at all).
Only measuring psychoacoustically weighted error would make for
a representative test, so that will be left for a future patch.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/mpegts: Replace silent cliping of language_count by asserts
Michael Niedermayer [Mon, 27 Jul 2015 16:03:53 +0000 (18:03 +0200)]
avformat/mpegts: Replace silent cliping of language_count by asserts

Failure should not be possible, if it does occur then the code is
buggy and should be fixed not silently clip

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 bilinear functions
Shivraj Patil [Mon, 27 Jul 2015 11:59:34 +0000 (17:29 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 bilinear functions

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/mpegts: Use DVB_TELETEXT timestamp heuristic also for DVB subtitles
Michael Niedermayer [Mon, 27 Jul 2015 13:13:50 +0000 (15:13 +0200)]
avformat/mpegts: Use DVB_TELETEXT timestamp heuristic also for DVB subtitles

Fixes Ticket4200

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c'
Michael Niedermayer [Mon, 27 Jul 2015 11:20:12 +0000 (13:20 +0200)]
Merge commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c'

* commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c':
  configure: Check for _M_ARMT to detect thumb when using MSVC

Conflicts:
configure

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '616b409c8f1e4fa568908212c01f6530da8d2e71'
Michael Niedermayer [Mon, 27 Jul 2015 11:07:46 +0000 (13:07 +0200)]
Merge commit '616b409c8f1e4fa568908212c01f6530da8d2e71'

* commit '616b409c8f1e4fa568908212c01f6530da8d2e71':
  configure: Check MSVC defines for identifying hardfloat

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '2192ff84dd720968108bc1ca54e239f4c94eb61d'
Michael Niedermayer [Mon, 27 Jul 2015 11:00:03 +0000 (13:00 +0200)]
Merge commit '2192ff84dd720968108bc1ca54e239f4c94eb61d'

* commit '2192ff84dd720968108bc1ca54e239f4c94eb61d':
  configure: Default to armasm for --toolchain=msvc when targeting arm

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'e4015b00d4e9e40dc1693a018edd51bf7a04993e'
Michael Niedermayer [Mon, 27 Jul 2015 10:51:40 +0000 (12:51 +0200)]
Merge commit 'e4015b00d4e9e40dc1693a018edd51bf7a04993e'

* commit 'e4015b00d4e9e40dc1693a018edd51bf7a04993e':
  configure: Simplify, remove an unnecessary intermediate variable

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '6d3081e6c374ff7da12b07ed33d1662be1b32dbc'
Michael Niedermayer [Mon, 27 Jul 2015 10:41:06 +0000 (12:41 +0200)]
Merge commit '6d3081e6c374ff7da12b07ed33d1662be1b32dbc'

* commit '6d3081e6c374ff7da12b07ed33d1662be1b32dbc':
  doc: Remove the now unnecessary remark about PATH and link.exe

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '9e8627a1ff9207b9e272d248da2e1bd0cc6fe2fe'
Michael Niedermayer [Mon, 27 Jul 2015 10:27:32 +0000 (12:27 +0200)]
Merge commit '9e8627a1ff9207b9e272d248da2e1bd0cc6fe2fe'

* commit '9e8627a1ff9207b9e272d248da2e1bd0cc6fe2fe':
  asfdec: interpret the first flag in an asf packet as length flag

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '65c14801527068fcaf729eeffc142ffd4682a21a'
Michael Niedermayer [Mon, 27 Jul 2015 09:57:16 +0000 (11:57 +0200)]
Merge commit '65c14801527068fcaf729eeffc142ffd4682a21a'

* commit '65c14801527068fcaf729eeffc142ffd4682a21a':
  checkasm: Modify report format

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'f3bd3810d274a7f51b5925fc3d2fc33e8043a5d4'
Michael Niedermayer [Mon, 27 Jul 2015 09:50:12 +0000 (11:50 +0200)]
Merge commit 'f3bd3810d274a7f51b5925fc3d2fc33e8043a5d4'

* commit 'f3bd3810d274a7f51b5925fc3d2fc33e8043a5d4':
  qsvdec_*: add missing CODEC_CAP_DR1

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoffserver: add (), fix order of operations
Michael Niedermayer [Mon, 27 Jul 2015 09:40:00 +0000 (11:40 +0200)]
ffserver: add (), fix order of operations

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoffserver: drop superfluous else clause
Reynaldo H. Verdejo Pinochet [Mon, 27 Jul 2015 02:53:08 +0000 (23:53 -0300)]
ffserver: drop superfluous else clause

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: simplify assignment with ternary
Reynaldo H. Verdejo Pinochet [Mon, 27 Jul 2015 02:11:37 +0000 (23:11 -0300)]
ffserver: simplify assignment with ternary

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: move decl to start of func
Reynaldo H. Verdejo Pinochet [Mon, 27 Jul 2015 01:29:47 +0000 (22:29 -0300)]
ffserver: move decl to start of func

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agodoc/decoders: Add entry for dvbsub and document compute_clut
Michael Niedermayer [Sun, 26 Jul 2015 22:06:43 +0000 (00:06 +0200)]
doc/decoders: Add entry for dvbsub and document compute_clut

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/dvbsubdec: Add option to select when to computer clut (always/never/"if needed")
Michael Niedermayer [Sun, 26 Jul 2015 16:38:18 +0000 (18:38 +0200)]
avcodec/dvbsubdec: Add option to select when to computer clut (always/never/"if needed")

Reviewed-by: Anshul <anshul.ffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '342b0ba5f93b09b1d0c2597db44605300e6fcc53'
Michael Niedermayer [Sun, 26 Jul 2015 21:32:29 +0000 (23:32 +0200)]
Merge commit '342b0ba5f93b09b1d0c2597db44605300e6fcc53'

* commit '342b0ba5f93b09b1d0c2597db44605300e6fcc53':
  configure: Only redirect strtoll to _strtoi64 if necessary

Conflicts:
configure

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a'
Michael Niedermayer [Sun, 26 Jul 2015 21:19:56 +0000 (23:19 +0200)]
Merge commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a'

* commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a':
  configure: Only redefine inline to __inline for msvc if necessary

Conflicts:
configure

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '0cff125200ab53fa3ae70d85b4f614f269fe3426'
Michael Niedermayer [Sun, 26 Jul 2015 20:58:09 +0000 (22:58 +0200)]
Merge commit '0cff125200ab53fa3ae70d85b4f614f269fe3426'

* commit '0cff125200ab53fa3ae70d85b4f614f269fe3426':
  configure: Only add -FIstdlib.h for msvc/icl if necessary

Conflicts:
configure

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '9b4b96c0dee90d260891ec765b28f6ca15594340'
Michael Niedermayer [Sun, 26 Jul 2015 20:41:18 +0000 (22:41 +0200)]
Merge commit '9b4b96c0dee90d260891ec765b28f6ca15594340'

* commit '9b4b96c0dee90d260891ec765b28f6ca15594340':
  force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.h

Conflicts:
libavcodec/dxva2_internal.h

See: c5327df838396e7c43a56bdd141c0f01ba3edc94
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/isom: Use AVRN codec to handle AVDJ
Michael Niedermayer [Sun, 26 Jul 2015 20:27:29 +0000 (22:27 +0200)]
avformat/isom: Use AVRN codec to handle AVDJ

Fixes cropping

Fixes Ticket4741

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/hlsenc: Fix wording in comment
Michael Niedermayer [Sun, 26 Jul 2015 20:06:19 +0000 (22:06 +0200)]
avformat/hlsenc: Fix wording in comment

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoforce WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to use DVXA
Steve Lhomme [Sun, 26 Jul 2015 11:35:47 +0000 (13:35 +0200)]
force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to use DVXA

The struct definitions in dxva.h, which are necessary in order to
actually use d3d11va, are hidden when WINAPI_FAMILY targets Windows Phone
or WindowsRT.

Building with WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP is disallowed
when targeting ARM. ("Compiling Desktop applications for the ARM
platform is not supported.") So we set _CRT_BUILD_DESKTOP_APP to 0
to tell the runtime not to detect some issues with this mismatching.

The same tweaks to detect if the API is available is done in dxva2_internal.h
when compiling each DXVA2/D3D11VA decoders.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoconfigure: Only redirect strtoll to _strtoi64 if necessary
Martin Storsjö [Sat, 25 Jul 2015 19:54:26 +0000 (22:54 +0300)]
configure: Only redirect strtoll to _strtoi64 if necessary

This isn't necessary any longer on MSVC 2013 Update 4.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoconfigure: Only redefine inline to __inline for msvc if necessary
Martin Storsjö [Sat, 25 Jul 2015 19:47:47 +0000 (22:47 +0300)]
configure: Only redefine inline to __inline for msvc if necessary

This isn't necessary on MSVC 2015 any longer.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoconfigure: Only add -FIstdlib.h for msvc/icl if necessary
Martin Storsjö [Sat, 25 Jul 2015 19:09:21 +0000 (22:09 +0300)]
configure: Only add -FIstdlib.h for msvc/icl if necessary

This is only necessary on MSVC 2010/2012 (and possibly on some
ICL versions). This both avoids an extra hack on newer MSVC
versions, and better documents what the extra compiler option
is used for.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoforce WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.h
Steve Lhomme [Sun, 26 Jul 2015 11:35:47 +0000 (13:35 +0200)]
force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.h

The struct definitions in dxva.h, which are necessary in order to
actually use d3d11va, are hidden when WINAPI_FAMILY targets Windows Phone
or WindowsRT.

Building with WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP is disallowed
when targeting ARM. ("Compiling Desktop applications for the ARM
platform is not supported.") So we set _CRT_BUILD_DESKTOP_APP to 0
to tell the runtime not to detect some issues with this mismatching.

The same tweaks to detect if the API is available is done in dxva2_internal.h
when compiling each DXVA2/D3D11VA decoders.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agomovtextdec.c: Add support for fontsize
Niklesh [Fri, 24 Jul 2015 09:05:16 +0000 (14:35 +0530)]
movtextdec.c: Add support for fontsize

Add support for fontsize in style records. The patch uses reset to
directly change back to default style instead of using closing tags,
since we are not handling the default styles right now.

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
4 years agoavcodec/nvenc: 2-pass mode works even with non-low latency presets now
WereCatf [Sun, 26 Jul 2015 14:51:41 +0000 (16:51 +0200)]
avcodec/nvenc: 2-pass mode works even with non-low latency presets now

Github: Closes #140

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
4 years agoavcodec/avrndec: Fix cropping
Michael Niedermayer [Sun, 26 Jul 2015 15:05:03 +0000 (17:05 +0200)]
avcodec/avrndec: Fix cropping

This also switches to using a separate AVCodecContext for the inner mjpeg decoder
which is cleaner and avoids fields from being overwritten with wrong values

Fixes Ticket162

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/dvbsubdec: Compute default CLUT based on bitmap analysis
Michael Niedermayer [Sun, 26 Jul 2015 12:22:41 +0000 (14:22 +0200)]
avcodec/dvbsubdec: Compute default CLUT based on bitmap analysis

Fixes displaying subtitles before any CLUT has been received
Fixes Ticket153

This will of course not display these initial subtitles in the correct
color (as that is not known at that point) but they should look clean
and not corrupted

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '4d0d55cd623bcd504867f948849380f6b4060b4d'
Michael Niedermayer [Sun, 26 Jul 2015 09:39:09 +0000 (11:39 +0200)]
Merge commit '4d0d55cd623bcd504867f948849380f6b4060b4d'

* commit '4d0d55cd623bcd504867f948849380f6b4060b4d':
  checkasm: Use LOCAL_ALIGNED

See: f467fc02b475cd45b68aa5fb5f7c78286110ba86
See: 9e83ac6114de3d94eb992eff8ed810234069a7b2
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agocheckasm: Use LOCAL_ALIGNED
Michael Niedermayer [Fri, 24 Jul 2015 21:46:21 +0000 (23:46 +0200)]
checkasm: Use LOCAL_ALIGNED

Fixes alignment issues and bus errors.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoswresample/x86: add missing colon to labels
James Almer [Sun, 26 Jul 2015 05:29:14 +0000 (02:29 -0300)]
swresample/x86: add missing colon to labels

Silences warnings with Nasm

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agox86/float_dsp: add missing colon to labels
James Almer [Sun, 26 Jul 2015 05:28:51 +0000 (02:28 -0300)]
x86/float_dsp: add missing colon to labels

Silences warnings with Nasm

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agox86/vf_interlace: add missing colon to labels
James Almer [Sun, 26 Jul 2015 05:28:36 +0000 (02:28 -0300)]
x86/vf_interlace: add missing colon to labels

Silences warnings with Nasm

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec/x86: add missing colon to labels
James Almer [Sun, 26 Jul 2015 05:28:16 +0000 (02:28 -0300)]
avcodec/x86: add missing colon to labels

Silences warnings with Nasm

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavformat/hlsenc: Add WebVtt support in hls
Anshul Maheshwari [Thu, 4 Jun 2015 07:55:52 +0000 (13:25 +0530)]
avformat/hlsenc: Add WebVtt support in hls

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/texturedsp: fix undefined shift
James Almer [Sat, 25 Jul 2015 01:12:39 +0000 (22:12 -0300)]
avcodec/texturedsp: fix undefined shift

Silences warnings when using -Wshift-overflow (GCC 6+)

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavformat/ipmovie: Fix late audio detection
Michael Niedermayer [Sun, 26 Jul 2015 02:00:02 +0000 (04:00 +0200)]
avformat/ipmovie: Fix late audio detection

Fixes audio in Ticket117

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/ipmovie: Parse&handle late audio init
Michael Niedermayer [Sun, 26 Jul 2015 01:41:57 +0000 (03:41 +0200)]
avformat/ipmovie: Parse&handle late audio init

Fixes Ticket117

Based on problem description by Kostya
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/ipmovie: Factor init_audio() out
Michael Niedermayer [Sun, 26 Jul 2015 01:39:55 +0000 (03:39 +0200)]
avformat/ipmovie: Factor init_audio() out

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavcodec/qsvdec_h264.c: using "private_spspps_buf" argument for av_bitstream_filter...
Ivan Uskov [Sat, 25 Jul 2015 19:56:08 +0000 (15:56 -0400)]
libavcodec/qsvdec_h264.c: using "private_spspps_buf" argument for av_bitstream_filter_filter() to avoid failure after decoder re-initialization.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavcodec/h264_mp4toannexb_bsf.c: Optional argument "private_spspps_buf" to avoid...
Ivan Uskov [Sat, 25 Jul 2015 20:11:30 +0000 (16:11 -0400)]
libavcodec/h264_mp4toannexb_bsf.c: Optional argument "private_spspps_buf" to avoid extradata modification.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986'
Michael Niedermayer [Sat, 25 Jul 2015 23:20:46 +0000 (01:20 +0200)]
Merge commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986'

* commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986':
  lavc: add Intel libmfx-based HEVC decoder.

Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/qsvdec.c
libavcodec/qsvdec_h2645.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'bf52f773913cf74bdf0d2c8c2cb4473fa1b7801e'
Michael Niedermayer [Sat, 25 Jul 2015 22:51:04 +0000 (00:51 +0200)]
Merge commit 'bf52f773913cf74bdf0d2c8c2cb4473fa1b7801e'

* commit 'bf52f773913cf74bdf0d2c8c2cb4473fa1b7801e':
  lavc: add Intel libmfx-based MPEG2 decoder.

Conflicts:
configure
libavcodec/qsvdec_mpeg2.c

Some cosmetics merged, rest is related to the removed parser code and
thus not merged

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/nvenc: Delay frame output to increase encoding speed
Timo Rothenpieler [Sat, 25 Jul 2015 21:20:28 +0000 (23:20 +0200)]
avcodec/nvenc: Delay frame output to increase encoding speed

4 years agoMerge commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741'
Michael Niedermayer [Sat, 25 Jul 2015 22:34:12 +0000 (00:34 +0200)]
Merge commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741'

* commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741':
  lavc: add a HEVC mp4->annex B bitstream filter

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '96dca089b19bf55293136277f5b081c56146e10e'
Michael Niedermayer [Sat, 25 Jul 2015 22:18:44 +0000 (00:18 +0200)]
Merge commit '96dca089b19bf55293136277f5b081c56146e10e'

* commit '96dca089b19bf55293136277f5b081c56146e10e':
  qsvdec: move qsv_process_data() from qsvdec_h264 to the common code

Conflicts:
libavcodec/qsvdec.c
libavcodec/qsvdec_h264.c

No change as the parser code has been removed

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/Makefile: fix order of framestep filter
Paul B Mahol [Fri, 24 Jul 2015 07:59:02 +0000 (07:59 +0000)]
avfilter/Makefile: fix order of framestep filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter: add sidechain compress audio filter
Paul B Mahol [Fri, 17 Jul 2015 18:44:16 +0000 (18:44 +0000)]
avfilter: add sidechain compress audio filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoMerge commit 'fa85fcf2b7d1ab822a59245077b8bb855406d3e9'
Michael Niedermayer [Sat, 25 Jul 2015 21:40:06 +0000 (23:40 +0200)]
Merge commit 'fa85fcf2b7d1ab822a59245077b8bb855406d3e9'

* commit 'fa85fcf2b7d1ab822a59245077b8bb855406d3e9':
  qsvenc_hevc: fix enum declaration

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/nvenc: Remove unused parameter
Timo Rothenpieler [Sat, 25 Jul 2015 21:26:42 +0000 (23:26 +0200)]
avcodec/nvenc: Remove unused parameter

4 years agoMerge commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d'
Michael Niedermayer [Sat, 25 Jul 2015 21:28:39 +0000 (23:28 +0200)]
Merge commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d'

* commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d':
  qsvdec: fix a memleak of async_fifo

Conflicts:
libavcodec/qsvdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d'
Michael Niedermayer [Sat, 25 Jul 2015 21:10:14 +0000 (23:10 +0200)]
Merge commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d'

* commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d':
  qsvdec: avoid an infinite loop with no consumed data and no output

Conflicts:
libavcodec/qsvdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/aacps_fixed_tablegen: change f_center to 64bit to avoid overflow
Michael Niedermayer [Sat, 25 Jul 2015 20:07:41 +0000 (22:07 +0200)]
avcodec/aacps_fixed_tablegen: change f_center to 64bit to avoid overflow

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavutil/softfloat: Add a test for av_sincos_sf()
Michael Niedermayer [Sat, 25 Jul 2015 19:28:05 +0000 (21:28 +0200)]
avutil/softfloat: Add a test for av_sincos_sf()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec: Add QSV VC-1 video decoder.
Ivan Uskov [Sat, 25 Jul 2015 16:28:11 +0000 (12:28 -0400)]
avcodec: Add QSV VC-1 video decoder.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/nutenc: Omit AV_PKT_DATA_QUALITY_STATS when storing side data.
Michael Niedermayer [Sat, 25 Jul 2015 16:39:17 +0000 (18:39 +0200)]
avformat/nutenc: Omit AV_PKT_DATA_QUALITY_STATS when storing side data.

This side data does not serve or improve decoding the data, it thus
would semantically be metadata and not side data.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>