ffmpeg.git
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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

5 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>
5 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>
5 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>
5 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>
5 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>
5 years agoavcodec/nvenc: Remove unused parameter
Timo Rothenpieler [Sat, 25 Jul 2015 21:26:42 +0000 (23:26 +0200)]
avcodec/nvenc: Remove unused parameter

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 years agolavc: add Intel libmfx-based HEVC decoder.
Anton Khirnov [Tue, 16 Jun 2015 16:22:11 +0000 (18:22 +0200)]
lavc: add Intel libmfx-based HEVC decoder.

5 years agolavc: add Intel libmfx-based MPEG2 decoder.
Anton Khirnov [Tue, 16 Jun 2015 16:22:11 +0000 (18:22 +0200)]
lavc: add Intel libmfx-based MPEG2 decoder.

5 years agoavcodec: Add QSV MPEG-2 video decoder.
Ivan Uskov [Sat, 25 Jul 2015 14:45:20 +0000 (10:45 -0400)]
avcodec: Add QSV MPEG-2 video decoder.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agolavc: add a HEVC mp4->annex B bitstream filter
Anton Khirnov [Thu, 9 Jul 2015 09:28:38 +0000 (11:28 +0200)]
lavc: add a HEVC mp4->annex B bitstream filter

5 years agoqsvdec: move qsv_process_data() from qsvdec_h264 to the common code
Anton Khirnov [Tue, 21 Jul 2015 16:57:49 +0000 (18:57 +0200)]
qsvdec: move qsv_process_data() from qsvdec_h264 to the common code

It will be shared with the upcoming mpeg2 and hevc decoders.

5 years agoqsvenc_hevc: fix enum declaration
Anton Khirnov [Tue, 21 Jul 2015 17:43:34 +0000 (19:43 +0200)]
qsvenc_hevc: fix enum declaration

Declare a named enum, not a variable with anonymous enum type.

5 years agoqsvdec: fix a memleak of async_fifo
Anton Khirnov [Tue, 21 Jul 2015 17:41:59 +0000 (19:41 +0200)]
qsvdec: fix a memleak of async_fifo

init() is called whenever format changes, so current code would leak the
fifo in this case.

5 years agoqsvdec: avoid an infinite loop with no consumed data and no output
Anton Khirnov [Thu, 9 Jul 2015 18:08:13 +0000 (20:08 +0200)]
qsvdec: avoid an infinite loop with no consumed data and no output

This is triggerable with the HEVC decoder. It is unclear yet whether the
bug is in the calling code or the MSDK, but it seems better to check for
this in any case.

5 years agoavcodec/dvdec: only attempt to conceal errors based on STA inconsistencies when error...
Michael Niedermayer [Sat, 25 Jul 2015 13:19:41 +0000 (15:19 +0200)]
avcodec/dvdec: only attempt to conceal errors based on STA inconsistencies when error_concealment is set

This allows the user to disable it in the hypothetical case that STA values are wrong

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavcodec/aacps: Fix ;;
Michael Niedermayer [Sat, 25 Jul 2015 12:07:55 +0000 (14:07 +0200)]
avcodec/aacps: Fix ;;

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavcodec/aactab: Add ff_aac_eld_window_480_fixed
Michael Niedermayer [Sat, 25 Jul 2015 11:22:09 +0000 (13:22 +0200)]
avcodec/aactab: Add ff_aac_eld_window_480_fixed

Fixes pointer type mismatch

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavcodec/aactab: Fix rounding of elements in ff_aac_eld_window_512_fixed
Michael Niedermayer [Sat, 25 Jul 2015 11:19:06 +0000 (13:19 +0200)]
avcodec/aactab: Fix rounding of elements in ff_aac_eld_window_512_fixed

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoswscale/output: Fix "warning: assignment from incompatible pointer type"
Michael Niedermayer [Sat, 25 Jul 2015 01:15:56 +0000 (03:15 +0200)]
swscale/output: Fix "warning: assignment from incompatible pointer type"

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavformat/async: wake up main thread before exit background thread
Zhang Rui [Tue, 21 Jul 2015 18:47:26 +0000 (02:47 +0800)]
avformat/async: wake up main thread before exit background thread

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavformat/async: move more code into locked area in background thread
Zhang Rui [Tue, 21 Jul 2015 18:47:25 +0000 (02:47 +0800)]
avformat/async: move more code into locked area in background thread

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavcodec/dvdec: skip 3rd stage ac decoding when the headers indicates that the data...
Michael Niedermayer [Fri, 24 Jul 2015 22:18:05 +0000 (00:18 +0200)]
avcodec/dvdec: skip 3rd stage ac decoding when the headers indicates that the data is inconsistent

Fixes Ticket1589

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 intra functions
Shivraj Patil [Thu, 23 Jul 2015 12:55:07 +0000 (18:25 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 intra 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>
5 years agoconfigure: fix LARGEADDRESSAWARE flag with MSVC
Hendrik Leppkes [Fri, 24 Jul 2015 11:16:43 +0000 (13:16 +0200)]
configure: fix LARGEADDRESSAWARE flag with MSVC

Otherwise it would get translated like a library path (-L option),
which breaks setting the flag.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavcodec/aacsbr: add missing header include
James Almer [Fri, 24 Jul 2015 19:25:01 +0000 (16:25 -0300)]
avcodec/aacsbr: add missing header include

Fixes make checkheaders

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoMerge commit 'c9edbe4af901e9bc9f05a62319637f9760df9a4a'
Michael Niedermayer [Fri, 24 Jul 2015 18:02:37 +0000 (20:02 +0200)]
Merge commit 'c9edbe4af901e9bc9f05a62319637f9760df9a4a'

* commit 'c9edbe4af901e9bc9f05a62319637f9760df9a4a':
  use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe

See: 58ed7b632842f3fedbe737c3945cabc56bab2f47
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agouse a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe
Steve Lhomme [Fri, 24 Jul 2015 07:38:04 +0000 (09:38 +0200)]
use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe

favor link over link.exe in case some wrapper script already exists
fallback to "link" in the path if the one next to cl is not found

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavcodec/dvdec: Retry decoding seemingly damaged MBs while skiping likely damaged...
Michael Niedermayer [Fri, 24 Jul 2015 15:24:57 +0000 (17:24 +0200)]
avcodec/dvdec: Retry decoding seemingly damaged MBs while skiping likely damaged parts

Improves decoding of Ticket1589

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agouse a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe
Steve Lhomme [Fri, 24 Jul 2015 07:38:04 +0000 (09:38 +0200)]
use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe

Fallback to "link" in the path if the one next to cl is not found.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoswscale: ayuv64le output support
Paul B Mahol [Fri, 3 Jul 2015 16:13:11 +0000 (16:13 +0000)]
swscale: ayuv64le output support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoswscale: ayuv64le input support
Paul B Mahol [Fri, 3 Jul 2015 12:15:47 +0000 (12:15 +0000)]
swscale: ayuv64le input support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavutil: add ayuv64le and ayuv64be packed pixel format
Paul B Mahol [Fri, 3 Jul 2015 10:57:58 +0000 (10:57 +0000)]
avutil: add ayuv64le and ayuv64be packed pixel format

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavfilter: rename vf_reverse.c to f_reverse.c
Paul B Mahol [Fri, 24 Jul 2015 02:09:53 +0000 (02:09 +0000)]
avfilter: rename vf_reverse.c to f_reverse.c

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavfilter: add areverse filter
Paul B Mahol [Tue, 21 Jul 2015 10:43:04 +0000 (10:43 +0000)]
avfilter: add areverse filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agolibavcodec/qsvdec_h264.c: packet buffering has been removed since qsvdec.c does maint...
Ivan Uskov [Tue, 21 Jul 2015 12:32:09 +0000 (08:32 -0400)]
libavcodec/qsvdec_h264.c: packet buffering has been removed since qsvdec.c does maintain own data buffering now.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agolibavcodec/qsvdec.c: The ff_qsv_decode() now guarantees the consumption of whole...
Ivan Uskov [Fri, 24 Jul 2015 10:26:14 +0000 (06:26 -0400)]
libavcodec/qsvdec.c: The ff_qsv_decode() now guarantees the consumption of whole packet.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavcodec/hapdec: Check that there is sufficient input data
Michael Niedermayer [Fri, 24 Jul 2015 01:25:49 +0000 (03:25 +0200)]
avcodec/hapdec: Check that there is sufficient input data

Fixes Ticket4729

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoMerge commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9'
Michael Niedermayer [Thu, 23 Jul 2015 22:44:58 +0000 (00:44 +0200)]
Merge commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9'

* commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9':
  configure: force -nologo- when detecting MSVC

Conflicts:
configure

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoMerge commit '44f7df0c987965763c609f6dc36974b04182e58d'
Michael Niedermayer [Thu, 23 Jul 2015 19:30:28 +0000 (21:30 +0200)]
Merge commit '44f7df0c987965763c609f6dc36974b04182e58d'

* commit '44f7df0c987965763c609f6dc36974b04182e58d':
  dds: Write the palette in the native endian form

Conflicts:
libavcodec/dds.c

See: 36a87c2dc7f302da3778bd0cff050b5c93a730c7
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoconfigure: force -nologo- when detecting MSVC
Steve Lhomme [Thu, 23 Jul 2015 17:25:44 +0000 (19:25 +0200)]
configure: force -nologo- when detecting MSVC

The -nologo- option is the inverse of -nologo, reenabling printing the
"logo" version header. This is useful if the compiler actually is a
wrapper that forces -nologo.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec/hap: (trivial) rename enum values and document their meaning
Tom Butterworth [Thu, 23 Jul 2015 18:44:24 +0000 (14:44 -0400)]
avcodec/hap: (trivial) rename enum values and document their meaning

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavcodec/hap: (trivial) clarify comment
Tom Butterworth [Thu, 23 Jul 2015 18:44:23 +0000 (14:44 -0400)]
avcodec/hap: (trivial) clarify comment

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agodds: Write the palette in the native endian form
Martin Storsjö [Thu, 23 Jul 2015 14:59:44 +0000 (17:59 +0300)]
dds: Write the palette in the native endian form

This fixes the palette on big endian, broken (or, differing from
little endian) since 57214b2f7.

Signed-off-by: Martin Storsjö <martin@martin.st>