ffmpeg.git
4 years agoavcodec/y41pdec: Avoid using float for size test
Michael Niedermayer [Sat, 23 May 2015 19:27:10 +0000 (21:27 +0200)]
avcodec/y41pdec: Avoid using float for size test

Floats are not bitexact

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibwebp: simplify AVCodec.close functions
James Almer [Sat, 23 May 2015 17:24:34 +0000 (14:24 -0300)]
libwebp: simplify AVCodec.close functions

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoconfigure: simplify libwebp checks
James Almer [Sat, 23 May 2015 05:14:26 +0000 (02:14 -0300)]
configure: simplify libwebp checks

The libwebpmux pkg-config file already has an explicit dependecy on libwebp >= 0.2.0.
Also remove the warning and silently disable the anim encoder when libwebpmux is not new enough.
This is more in line with other library components, like libvpx-vp9

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agonutdec: fix various memleaks on failure
Andreas Cadhalpun [Fri, 22 May 2015 21:02:07 +0000 (23:02 +0200)]
nutdec: fix various memleaks on failure

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavcodec/dcadec: Search and decode frame in case it starts later in a packet
Michael Niedermayer [Sat, 23 May 2015 14:23:52 +0000 (16:23 +0200)]
avcodec/dcadec: Search and decode frame in case it starts later in a packet

This fixes decoding the first frame of some dts files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/wavdec: Increase dts packet threshold to fix more misdetections
Rodger Combs [Sat, 23 May 2015 12:07:14 +0000 (14:07 +0200)]
avformat/wavdec: Increase dts packet threshold to fix more misdetections

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/wavdec: Increase probe_packets limit
Michael Niedermayer [Sat, 23 May 2015 10:03:38 +0000 (12:03 +0200)]
avformat/wavdec: Increase probe_packets limit

Fixes DTS detection of b2429e5ba9.dts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agonutdec: always check the get_str return value
Andreas Cadhalpun [Fri, 22 May 2015 20:58:55 +0000 (22:58 +0200)]
nutdec: always check the get_str return value

If it fails, the buffers can be (partially) uninitialized.

This fixes 'Conditional jump or move depends on uninitialised value(s)'
valgrind warnings.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agolibwebp: use a separate AVClass for each encoder
James Almer [Sat, 23 May 2015 04:51:45 +0000 (01:51 -0300)]
libwebp: use a separate AVClass for each encoder

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agolibwebpenc_common: add header guards
James Almer [Sat, 23 May 2015 04:44:32 +0000 (01:44 -0300)]
libwebpenc_common: add header guards

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agolibwebp: remove unneeded defines
James Almer [Sat, 23 May 2015 04:28:44 +0000 (01:28 -0300)]
libwebp: remove unneeded defines

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoWebP encoder: use WebPAnimEncoder API when available.
Urvang Joshi [Wed, 20 May 2015 01:04:07 +0000 (18:04 -0700)]
WebP encoder: use WebPAnimEncoder API when available.

WebPAnimEncoder API is a combination of encoder (WebPEncoder) and muxer
(WebPMux). It performs several optimizations to make it more efficient
than the combination of WebPEncode() and native ffmpeg muxer.

When WebPAnimEncoder API is used:
- In the encoder layer: we use WebPAnimEncoderAdd() instead of
  WebPEncode().
- The muxer layer: works like a raw muxer.

On the other hand, when WebPAnimEncoder API isn't available, the old code is
used as it is:
- In the codec layer: WebPEncode is used to encode each frame
- In the muxer layer:  ffmpeg muxer is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/nutdec: Check X in 2nd branch of index reading
Michael Niedermayer [Fri, 22 May 2015 22:23:05 +0000 (00:23 +0200)]
avformat/nutdec: Check X in 2nd branch of index reading

Prevents read of uninitialized variable

Based on patch by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4e17946f10d39eec6cc03fb249ae8147373141b6'
Michael Niedermayer [Fri, 22 May 2015 19:25:57 +0000 (21:25 +0200)]
Merge commit '4e17946f10d39eec6cc03fb249ae8147373141b6'

* commit '4e17946f10d39eec6cc03fb249ae8147373141b6':
  mpegvideo: Rework various functions not to use MpegEncContext directly

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2'
Michael Niedermayer [Fri, 22 May 2015 19:17:18 +0000 (21:17 +0200)]
Merge commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2'

* commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2':
  mpegvideo: Have ff_mpeg_ref_picture use AVCodecContext directly

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd528045558825f01472e9bee873f60c98d661e53'
Michael Niedermayer [Fri, 22 May 2015 18:57:30 +0000 (20:57 +0200)]
Merge commit 'd528045558825f01472e9bee873f60c98d661e53'

* commit 'd528045558825f01472e9bee873f60c98d661e53':
  mpegvideo: Have ff_mpeg_unref_picture use AVCodecContext directly

Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c

The memset is left in place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc'
Michael Niedermayer [Fri, 22 May 2015 18:49:04 +0000 (20:49 +0200)]
Merge commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc'

* commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc':
  mpegvideo: Drop stream_codec_tag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9c1db92ad372d4cd69e0490e691c56e4097cb193'
Michael Niedermayer [Fri, 22 May 2015 18:38:07 +0000 (20:38 +0200)]
Merge commit '9c1db92ad372d4cd69e0490e691c56e4097cb193'

* commit '9c1db92ad372d4cd69e0490e691c56e4097cb193':
  mpegvideo: Drop err_recognition

Conflicts:
libavcodec/h263dec.c
libavcodec/ituh263dec.c
libavcodec/mpeg4video.h
libavcodec/mpeg4videodec.c
libavcodec/msmpeg4dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'
Michael Niedermayer [Fri, 22 May 2015 18:12:51 +0000 (20:12 +0200)]
Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'

* commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42':
  mpegvideo: Drop flags and flags2

Conflicts:
libavcodec/mpeg12dec.c
libavcodec/mpeg12enc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/ratecontrol.c
libavcodec/vc1_block.c
libavcodec/vc1_loopfilter.c
libavcodec/vc1_mc.c
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/movtextdec: Add support for large boxes(>32 bit)
Niklesh [Thu, 21 May 2015 15:55:39 +0000 (21:25 +0530)]
avcodec/movtextdec: Add support for large boxes(>32 bit)

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
4 years agompegvideo: Rework various functions not to use MpegEncContext directly
Vittorio Giovara [Mon, 27 Apr 2015 21:09:21 +0000 (22:09 +0100)]
mpegvideo: Rework various functions not to use MpegEncContext directly

4 years agompegvideo: Have ff_mpeg_ref_picture use AVCodecContext directly
Vittorio Giovara [Mon, 27 Apr 2015 21:09:20 +0000 (22:09 +0100)]
mpegvideo: Have ff_mpeg_ref_picture use AVCodecContext directly

4 years agompegvideo: Have ff_mpeg_unref_picture use AVCodecContext directly
Vittorio Giovara [Mon, 27 Apr 2015 21:09:19 +0000 (22:09 +0100)]
mpegvideo: Have ff_mpeg_unref_picture use AVCodecContext directly

This skips setting the memory to 0 but allows for reuse on different
contextes. Oracle did not report any unsual activity because of it.

4 years agompegvideo: Drop stream_codec_tag
Vittorio Giovara [Mon, 27 Apr 2015 18:13:28 +0000 (19:13 +0100)]
mpegvideo: Drop stream_codec_tag

The field is unused.

4 years agompegvideo: Drop err_recognition
Vittorio Giovara [Mon, 27 Apr 2015 18:13:27 +0000 (19:13 +0100)]
mpegvideo: Drop err_recognition

It is just a duplicate of an AVCodecContext member so use it instead.

4 years agompegvideo: Drop flags and flags2
Vittorio Giovara [Mon, 27 Apr 2015 18:13:25 +0000 (19:13 +0100)]
mpegvideo: Drop flags and flags2

They are just duplicates of AVCodecContext members so use those instead.

4 years agoavformat/mxfenc: Add color siting element
Michael Niedermayer [Mon, 18 May 2015 23:11:09 +0000 (01:11 +0200)]
avformat/mxfenc: Add color siting element

Previous version Reviewed-by: tim nicholson <nichot20@yahoo.com>
Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat/mux: Add ff_choose_chroma_location()
Michael Niedermayer [Fri, 22 May 2015 11:42:24 +0000 (13:42 +0200)]
libavformat/mux: Add ff_choose_chroma_location()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpeg12dec: Fix chroma location
Michael Niedermayer [Fri, 22 May 2015 13:08:58 +0000 (15:08 +0200)]
avcodec/mpeg12dec: Fix chroma location

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/pixfmt: Clarify DV example comments for AVChromaLocation
Tim Nicholson [Fri, 22 May 2015 09:31:26 +0000 (10:31 +0100)]
avutil/pixfmt: Clarify DV example comments for AVChromaLocation

Signed-off-by: Tim Nicholson <tim.nicholson@bbc.co.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '29216d7fd14d1cec16821867d17c90b5c49e8c07'
Michael Niedermayer [Fri, 22 May 2015 09:52:21 +0000 (11:52 +0200)]
Merge commit '29216d7fd14d1cec16821867d17c90b5c49e8c07'

* commit '29216d7fd14d1cec16821867d17c90b5c49e8c07':
  tls: fix compilation when both gnutls and openssl are enabled

See: e91fbfd9cf17270d78c73add53fada4c217fdb5e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotls: fix compilation when both gnutls and openssl are enabled
James Almer [Fri, 22 May 2015 03:32:17 +0000 (00:32 -0300)]
tls: fix compilation when both gnutls and openssl are enabled

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agotls: fix compilation when both gnutls and openssl are enabled
James Almer [Fri, 22 May 2015 03:32:17 +0000 (00:32 -0300)]
tls: fix compilation when both gnutls and openssl are enabled

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoWebP encoder: extract out some methods into a separate helper library.
Urvang Joshi [Wed, 20 May 2015 00:39:54 +0000 (17:39 -0700)]
WebP encoder: extract out some methods into a separate helper library.

This is the 2nd patch in preparation for using WebPAnimEncoder API for encoding
and muxing WebP images.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '94599a6de3822b13c94096d764868128f388ba28'
Michael Niedermayer [Fri, 22 May 2015 00:49:34 +0000 (02:49 +0200)]
Merge commit '94599a6de3822b13c94096d764868128f388ba28'

* commit '94599a6de3822b13c94096d764868128f388ba28':
  tls: Remove all the local polling loops

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd13b124eaf452b267480074b2e6946538ed03a6e'
Michael Niedermayer [Fri, 22 May 2015 00:37:23 +0000 (02:37 +0200)]
Merge commit 'd13b124eaf452b267480074b2e6946538ed03a6e'

* commit 'd13b124eaf452b267480074b2e6946538ed03a6e':
  tls: Remove the nonblocking code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02'
Michael Niedermayer [Fri, 22 May 2015 00:28:22 +0000 (02:28 +0200)]
Merge commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02'

* commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02':
  tls: Use custom IO to read from the URLContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoWebP muxer: support a packet containing animated WebP.
Urvang Joshi [Wed, 20 May 2015 00:39:54 +0000 (17:39 -0700)]
WebP muxer: support a packet containing animated WebP.

This is the 1st patch in preparation for using WebPAnimEncoder API for encoding
and muxing WebP images.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotls: Remove all the local polling loops
Martin Storsjö [Thu, 10 Nov 2011 15:44:27 +0000 (17:44 +0200)]
tls: Remove all the local polling loops

These aren't necessary any longer.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agotls: Remove the nonblocking code
Martin Storsjö [Thu, 10 Nov 2011 15:35:39 +0000 (17:35 +0200)]
tls: Remove the nonblocking code

Since the underlying URLContext read functions are used,
they handle interruption, without having to handle it at
this level.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agotls: Use custom IO to read from the URLContext
Martin Storsjö [Thu, 10 Nov 2011 14:58:58 +0000 (16:58 +0200)]
tls: Use custom IO to read from the URLContext

This avoids hijacking the fd, by reading using the normal
URLContext functions instead. This allowing reading data that has
been buffered in the underlying URLContext.

This avoids using the libraries own send functions that can
cause SIGPIPE.

The fd is still used for polling the lowlevel socket, for
waiting for retries.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agodoc/ffmpeg: basic documentation for -copy/ignore_unknown
Michael Niedermayer [Thu, 21 May 2015 20:29:53 +0000 (22:29 +0200)]
doc/ffmpeg: basic documentation for -copy/ignore_unknown

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: check result of avio_seek
Zhang Rui [Thu, 21 May 2015 03:48:55 +0000 (11:48 +0800)]
avformat/mov: check result of avio_seek

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: Support copying unknown streams
Michael Niedermayer [Wed, 20 May 2015 22:34:41 +0000 (00:34 +0200)]
ffmpeg: Support copying unknown streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mips: loongson fix bugs in mathops optimization
周晓勇 [Thu, 21 May 2015 08:31:58 +0000 (16:31 +0800)]
avcodec/mips: loongson fix bugs in mathops optimization

the incorrect UMULH, ff_sqrt, MAC64 and MLS64 to be optimized later, delete them just for now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/pixfmt: s/luma sample positions/horizontal luma sample positions/
Michael Niedermayer [Thu, 21 May 2015 10:48:16 +0000 (12:48 +0200)]
avutil/pixfmt: s/luma sample positions/horizontal luma sample positions/

Better to be explicit before someone thinks this could be the time axis ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/pixfmt: make luma sample positions even more explicit in the AVChromaLocation...
Michael Niedermayer [Thu, 21 May 2015 10:44:23 +0000 (12:44 +0200)]
avutil/pixfmt: make luma sample positions even more explicit in the AVChromaLocation ASCII art

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/pixfmt: Clarify mpeg example comments for AVChromaLocation
Michael Niedermayer [Thu, 21 May 2015 10:40:29 +0000 (12:40 +0200)]
avutil/pixfmt: Clarify mpeg example comments for AVChromaLocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/pixfmt: clarify chroma location text further, as "first" is ambigous
Michael Niedermayer [Thu, 21 May 2015 10:35:22 +0000 (12:35 +0200)]
avutil/pixfmt: clarify chroma location text further, as "first" is ambigous

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/pixfmt: Clarify that the ASCII art describes the location of the first chroma...
Michael Niedermayer [Thu, 21 May 2015 10:18:31 +0000 (12:18 +0200)]
avutil/pixfmt: Clarify that the ASCII art describes the location of the first chroma sample of AVChromaLocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg_opt: add missing space in error message
Michael Niedermayer [Wed, 20 May 2015 23:47:50 +0000 (01:47 +0200)]
ffmpeg_opt: add missing space in error message

Found-by: rcombs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Wed, 20 May 2015 23:26:30 +0000 (01:26 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavc/qdrw: Do not fail decoding valid Quickdraw images.
  lavf/mov: Use AVCOL_SPC constants when checking color_space.
  lavf/mov: Write colour matrix "6" for color_space bt470bg.
  lavf/mkv: Only skip prores header if the packet is large enough.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg_opt: fix the error message log level for the unsupported stream types
Michael Niedermayer [Wed, 20 May 2015 23:09:49 +0000 (01:09 +0200)]
ffmpeg_opt: fix the error message log level for the unsupported stream types

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg_opt: Give the user a hint on how to ignore unsupported streams
Michael Niedermayer [Wed, 20 May 2015 23:09:04 +0000 (01:09 +0200)]
ffmpeg_opt: Give the user a hint on how to ignore unsupported streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibvpx: add support for yuv440p and yuv440p10/12 encoding
James Almer [Wed, 20 May 2015 20:52:47 +0000 (17:52 -0300)]
libvpx: add support for yuv440p and yuv440p10/12 encoding

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agolavc/qdrw: Do not fail decoding valid Quickdraw images.
Carl Eugen Hoyos [Wed, 20 May 2015 23:05:13 +0000 (01:05 +0200)]
lavc/qdrw: Do not fail decoding valid Quickdraw images.

4 years agolavf/mov: Use AVCOL_SPC constants when checking color_space.
Carl Eugen Hoyos [Wed, 20 May 2015 23:04:57 +0000 (01:04 +0200)]
lavf/mov: Use AVCOL_SPC constants when checking color_space.

Suggested-by: Ronald Bultje
4 years agolavf/mov: Write colour matrix "6" for color_space bt470bg.
Carl Eugen Hoyos [Wed, 20 May 2015 22:44:34 +0000 (00:44 +0200)]
lavf/mov: Write colour matrix "6" for color_space bt470bg.

This matches the demuxer's behaviour.

4 years agoffmpeg: support ignoring unsupported mapped streams
Rodger Combs [Wed, 20 May 2015 22:49:18 +0000 (17:49 -0500)]
ffmpeg: support ignoring unsupported mapped streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/mkv: Only skip prores header if the packet is large enough.
Carl Eugen Hoyos [Wed, 20 May 2015 22:43:38 +0000 (00:43 +0200)]
lavf/mkv: Only skip prores header if the packet is large enough.

Fixes a possible endless loop.

4 years agoMerge commit '3efe0393e4f0eaa27bac8833edbd7d3cff4704e1'
Michael Niedermayer [Wed, 20 May 2015 17:33:13 +0000 (19:33 +0200)]
Merge commit '3efe0393e4f0eaa27bac8833edbd7d3cff4704e1'

* commit '3efe0393e4f0eaa27bac8833edbd7d3cff4704e1':
  hevc: make avcodec_decode_video2() fail if get_format() fails

Conflicts:
libavcodec/hevc.c

See: cc5e4bb48476a89cc8ce0c41bc2bd2e8fda9b37c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agonutdec: abort if EOF is reached in decode_info_header/read_sm_data
Andreas Cadhalpun [Tue, 19 May 2015 22:34:42 +0000 (00:34 +0200)]
nutdec: abort if EOF is reached in decode_info_header/read_sm_data

These loops can take a lot of time if count is very large.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavcodec/vmnc: Add back adapted comment about 24bit
Vittorio Giovara [Wed, 20 May 2015 17:24:54 +0000 (19:24 +0200)]
avcodec/vmnc: Add back adapted comment about 24bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7046bd9bc9ce04521edf453c9b603d84d69c7512'
Michael Niedermayer [Wed, 20 May 2015 17:03:51 +0000 (19:03 +0200)]
Merge commit '7046bd9bc9ce04521edf453c9b603d84d69c7512'

* commit '7046bd9bc9ce04521edf453c9b603d84d69c7512':
  lavfi: Move avcodec header to the only filter needing it

Conflicts:
libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agonutdec: stop skipping bytes at EOF
Andreas Cadhalpun [Tue, 19 May 2015 22:31:24 +0000 (00:31 +0200)]
nutdec: stop skipping bytes at EOF

This can unnecessarily waste a lot of time.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agonutdec: fix infinite resync loops
Andreas Cadhalpun [Tue, 19 May 2015 22:06:05 +0000 (00:06 +0200)]
nutdec: fix infinite resync loops

nut->last_syncpoint_pos doesn't necessarily change between resync
attempts, so find_any_startcode can return the same startcode again.

Thus remember where the last resync happened and don't try to resync
before that.

This can't be done locally in nut_read_packet, because this wouldn't
prevent infinite resync loops, where after the resync a packet is
returned and while reading a following packet the resync happens again.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavcodec/vmnc: Simplify "24bit" support
Michael Niedermayer [Wed, 20 May 2015 16:50:38 +0000 (18:50 +0200)]
avcodec/vmnc: Simplify "24bit" support

This also makes the code more robust, removing potential out of
array writes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'eafbc6716cede6d4a652f8bedf82f2901c68d06d'
Michael Niedermayer [Wed, 20 May 2015 16:31:55 +0000 (18:31 +0200)]
Merge commit 'eafbc6716cede6d4a652f8bedf82f2901c68d06d'

* commit 'eafbc6716cede6d4a652f8bedf82f2901c68d06d':
  vmnc: Delay pixel size check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevc: Remove unused variable
Michael Niedermayer [Wed, 20 May 2015 16:15:22 +0000 (18:15 +0200)]
avcodec/hevc: Remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: add cpuflags for loongson3 series cpu
周晓勇 [Wed, 20 May 2015 10:17:56 +0000 (18:17 +0800)]
configure: add cpuflags for loongson3 series cpu

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/nutdec: Fix recovery when immedeately after seeking a failure happens
Michael Niedermayer [Wed, 20 May 2015 15:32:48 +0000 (17:32 +0200)]
avformat/nutdec: Fix recovery when immedeately after seeking a failure happens

Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/nutdec: Return error on EOF from get_str()
Michael Niedermayer [Wed, 20 May 2015 15:13:15 +0000 (17:13 +0200)]
avformat/nutdec: Return error on EOF from get_str()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: Add fate-mathops test
Michael Niedermayer [Wed, 20 May 2015 11:40:35 +0000 (13:40 +0200)]
fate: Add fate-mathops test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec: add mathops test
Michael Niedermayer [Wed, 20 May 2015 11:38:01 +0000 (13:38 +0200)]
avcodec: add mathops test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc/vmnc: Fix 32bit colour-space, there is no transparency.
Carl Eugen Hoyos [Wed, 20 May 2015 12:59:38 +0000 (14:59 +0200)]
lavc/vmnc: Fix 32bit colour-space, there is no transparency.

4 years agoconfigure: disable mipsfpu for loongson3
周晓勇 [Wed, 20 May 2015 10:15:49 +0000 (18:15 +0800)]
configure: disable mipsfpu for loongson3

MIPSFPU optimization does't support FATE correctly on Loongson-3.

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/encoders: add flac
Michael Niedermayer [Wed, 20 May 2015 00:31:03 +0000 (02:31 +0200)]
doc/encoders: add flac

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFix movtext crashes caused due to lack of proper bounds checking
Niklesh [Tue, 19 May 2015 12:52:55 +0000 (18:22 +0530)]
Fix movtext crashes caused due to lack of proper bounds checking

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
4 years agoavcodec/flacenc: Support Multi dimensional quantization
Michael Niedermayer [Tue, 19 May 2015 23:23:39 +0000 (01:23 +0200)]
avcodec/flacenc: Support Multi dimensional quantization

Now with exact bit computations if exact_rice_parameters is enabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevc: make avcodec_decode_video2() fail if get_format() fails
wm4 [Thu, 14 May 2015 17:23:57 +0000 (19:23 +0200)]
hevc: make avcodec_decode_video2() fail if get_format() fails

Personally, I need the decoder to back out if get_format() returns no
usable pixel format. This didn't work because the error code was not
propagated down the call chain. This in turn happened because the
variable declaration removed in this patch shadowed the variable, whose
value is returned at the end of the function. Consequently, failures of
decode_nal_unit() were ignored in this place.

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavfi: Move avcodec header to the only filter needing it
Vittorio Giovara [Thu, 14 May 2015 22:37:25 +0000 (23:37 +0100)]
lavfi: Move avcodec header to the only filter needing it

af_ashowinfo, due to the enum AVAudioServiceType use.

4 years agovmnc: Delay pixel size check
Vittorio Giovara [Tue, 19 May 2015 15:57:46 +0000 (16:57 +0100)]
vmnc: Delay pixel size check

Some clients incorrectly set 24 as bits_per_coded_sample, while
the actual value is preserved in one of the codec headers.
In order to work around this, delay the check until decode_frame().

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoavcodec/flacenc: Mark pointers/array arguments const which are not changed
Michael Niedermayer [Tue, 19 May 2015 17:47:22 +0000 (19:47 +0200)]
avcodec/flacenc: Mark pointers/array arguments const which are not changed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/flacenc: Simplify md5 calculation code by using AV_WL24()
Michael Niedermayer [Tue, 19 May 2015 17:41:44 +0000 (19:41 +0200)]
avcodec/flacenc: Simplify md5 calculation code by using AV_WL24()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/pixfmt: Improve ascii art showing the meaning of the AVChromaLocation values
Michael Niedermayer [Tue, 19 May 2015 15:47:04 +0000 (17:47 +0200)]
avutil/pixfmt: Improve ascii art showing the meaning of the AVChromaLocation values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/flacenc: Move udata and sums to FlacSubframe
Michael Niedermayer [Tue, 19 May 2015 11:48:30 +0000 (13:48 +0200)]
avcodec/flacenc: Move udata and sums to FlacSubframe

This significantly reduces the amount of stack space needed and
also permits to simply copy the rice context again without speed
penalty

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: Add test for -exact_rice_parameters 1
Michael Niedermayer [Tue, 19 May 2015 11:43:18 +0000 (13:43 +0200)]
fate: Add test for -exact_rice_parameters 1

4 years agoavcodec/flacenc: Support calculating rice parameters exactly
Michael Niedermayer [Tue, 19 May 2015 11:26:55 +0000 (13:26 +0200)]
avcodec/flacenc: Support calculating rice parameters exactly

Some files benefit by about 0.3% from this, and speedwise its ok
other files do not benefit and encode to the same size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/flacenc: Do not copy unused udata array -> 5x faster calc_rice_params()
Michael Niedermayer [Tue, 19 May 2015 10:11:27 +0000 (12:11 +0200)]
avcodec/flacenc: Do not copy unused udata array -> 5x faster calc_rice_params()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/golomb: Remove disabled and broken code
Michael Niedermayer [Tue, 19 May 2015 01:23:39 +0000 (03:23 +0200)]
avcodec/golomb: Remove disabled and broken code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mss2: use < 0 instead of != 0 to check for error of vlc initialization
Michael Niedermayer [Tue, 19 May 2015 01:22:33 +0000 (03:22 +0200)]
avcodec/mss2: use < 0 instead of != 0 to check for error of vlc initialization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg_opt: Compensate for DTS/PTS difference in seeking when its based on DTS
Michael Niedermayer [Mon, 18 May 2015 18:27:04 +0000 (20:27 +0200)]
ffmpeg_opt: Compensate for DTS/PTS difference in seeking when its based on DTS

Fixes Ticket4554

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavcodec/x265: detect csps in libx265_encode_init_csp()
Steve Borho [Sat, 16 May 2015 03:05:12 +0000 (22:05 -0500)]
libavcodec/x265: detect csps in libx265_encode_init_csp()

Without this change, if you link with an 8bit libx265 and try to specify
a 10bit input color space via:

  ffmpeg -i in.mov -c:v libx265 -pix_fmt yuv420p10le out.mp4

It will error with:

  Incompatible pixel format 'yuv420p10le' for codec 'libx265',
  auto-selecting format 'yuv420p'

With this fix, it will learn if a 10bit libx265 is available at startup,
and thus allow 10bit input color spaces.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoavcodec/snow_dwt: Remove ff_ prefix from ff_spatial_idwt_init() and ff_spatial_idwt_s...
Michael Niedermayer [Mon, 18 May 2015 12:07:48 +0000 (14:07 +0200)]
avcodec/snow_dwt: Remove ff_ prefix from ff_spatial_idwt_init() and ff_spatial_idwt_slice()

They are only used once in the file in which they are defined

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevc_cabac: Rename ff_hevc_transform_skip_flag_decode() to hevc_transform_ski...
Michael Niedermayer [Mon, 18 May 2015 11:28:14 +0000 (13:28 +0200)]
avcodec/hevc_cabac: Rename ff_hevc_transform_skip_flag_decode() to hevc_transform_skip_flag_decode()

The function is static and used once in the file its defined in

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/avfiltergraph: Rename ff_avfilter_graph_config_pointers to graph_config_poin...
Michael Niedermayer [Mon, 18 May 2015 11:22:27 +0000 (13:22 +0200)]
avfilter/avfiltergraph: Rename ff_avfilter_graph_config_pointers to graph_config_pointers.

The function is static and only used once in the file its defined in.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mxfenc: Set horizontal chroma subsample value from pixel format if available
Michael Niedermayer [Sat, 16 May 2015 18:02:01 +0000 (20:02 +0200)]
avformat/mxfenc: Set horizontal chroma subsample value from pixel format if available

Reviewed-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mxfenc: Set the component depth from the pixel format if available
Michael Niedermayer [Sat, 16 May 2015 17:59:18 +0000 (19:59 +0200)]
avformat/mxfenc: Set the component depth from the pixel format if available

Reviewed-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'rbultje/vp9-bugfixes'
Michael Niedermayer [Mon, 18 May 2015 00:35:12 +0000 (02:35 +0200)]
Merge remote-tracking branch 'rbultje/vp9-bugfixes'

* rbultje/vp9-bugfixes:
  vp9: match another find_ref_mvs() bug in libvpx.
  vp9: fix scaled motion vector clipping for sub8x8 blocks.
  vp9: improve signbias check.
  vp9: don't allow compound references if error_resilience is enabled.
  vp9: clamp segmented lflvl before applying ref/mode deltas.
  vp9: reset loopfilter mode/ref deltas on keyframe.
  vp9: fix crash when playing back 440/440 content with width%64<56.
  vp9: extend loopfilter workaround for vp9 h/v mix-up to work for 422.
  vp9: clip motion vectors in the same way as libvpx does.
  vp9: set skip flag if the block had no coded coefficients.
  vp9: apply mv scaling workaround only when subsampling is enabled.
  vp9: read all 4x4 blocks in sub8x8 blocks individually with scalability.
  vp9: fix segmentation map referencing upon framesize change.
  vp9: disable more pmulhrsw optimizations in idct16/32.
  vp9: disable all pmulhrsw in 8/16 iadst x86 optimizations.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agocmdutils: Fix sign error in display matrix auto-rotation code
Michael Niedermayer [Sun, 17 May 2015 23:11:02 +0000 (01:11 +0200)]
cmdutils: Fix sign error in display matrix auto-rotation code

This makes the sample from Ticket4560 behave consistently with either branch

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>