ffmpeg.git
4 years agoavcodec/mpegvideo: Use av_memdup() for allocating thread_context
Michael Niedermayer [Sat, 6 Jun 2015 19:28:54 +0000 (21:28 +0200)]
avcodec/mpegvideo: Use av_memdup() for allocating thread_context

Also check for allocation failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo: Clear thread_context array before allocating
Michael Niedermayer [Sat, 6 Jun 2015 19:25:04 +0000 (21:25 +0200)]
avcodec/mpegvideo: Clear thread_context array before allocating

This is probably redundant but its safer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo: Merge thread context initialization loops
Michael Niedermayer [Sat, 6 Jun 2015 19:16:10 +0000 (21:16 +0200)]
avcodec/mpegvideo: Merge thread context initialization loops

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/nvenc: Add 'nvenc_h264' as an alternative name for 'nvenc'
Philip Langdale [Sat, 6 Jun 2015 18:09:15 +0000 (11:09 -0700)]
avcodec/nvenc: Add 'nvenc_h264' as an alternative name for 'nvenc'

This allows us to offer the same codec name that libav uses. We don't have
a special way to do aliases, so it's all a bit more verbose than you'd want
but such is life.

Signed-off-by: Philip Langdale <philipl@overt.org>
4 years agoavcodec/nvenc: Rename nvenc_h265 to nvenc_hevc
Philip Langdale [Sat, 6 Jun 2015 18:00:45 +0000 (11:00 -0700)]
avcodec/nvenc: Rename nvenc_h265 to nvenc_hevc

For the sake of compatibility, and because pretty much everything else in the
codebase calls it HEVC.

Signed-off-by: Philip Langdale <philipl@overt.org>
4 years agoRevert "avcodec: Rename nvenc.c to nvenc_a.c, to avoid conflict with the other implem...
Philip Langdale [Sat, 6 Jun 2015 17:42:00 +0000 (10:42 -0700)]
Revert "avcodec: Rename nvenc.c to nvenc_a.c, to avoid conflict with the other implementation"

This reverts commit d0d0913702358c61dfb9c5ac8b141cd203524869.

Signed-off-by: Philip Langdale <philipl@overt.org>
4 years agoRevert "Merge commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e'"
Philip Langdale [Sat, 6 Jun 2015 17:41:34 +0000 (10:41 -0700)]
Revert "Merge commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e'"

This reverts commit d8bbb99c51af08c76dd0a66588fecc5c0106844d, reversing
changes made to d0d0913702358c61dfb9c5ac8b141cd203524869.

Signed-off-by: Philip Langdale <philipl@overt.org>
4 years agoRevert "nvenc: remove cuda.h requirement for nvenc_a"
Philip Langdale [Sat, 6 Jun 2015 17:40:34 +0000 (10:40 -0700)]
Revert "nvenc: remove cuda.h requirement for nvenc_a"

This reverts commit f10497042f092d56f82f536276d5998d7fd1e4c4.

Signed-off-by: Philip Langdale <philipl@overt.org>
4 years agoRevert "avcodec/Makefile: fix checkheaders for nvenc_b"
Philip Langdale [Sat, 6 Jun 2015 17:40:21 +0000 (10:40 -0700)]
Revert "avcodec/Makefile: fix checkheaders for nvenc_b"

This reverts commit 3be811a528461816063059377fcb2ac60eabfa77.

Signed-off-by: Philip Langdale <philipl@overt.org>
4 years agoRevert "Changelog: Drop duplicate NVENC entry"
Philip Langdale [Sat, 6 Jun 2015 17:40:11 +0000 (10:40 -0700)]
Revert "Changelog: Drop duplicate NVENC entry"

This reverts commit 440fa7758b687bbb0007f85497eed8bb9aec96bd.

Signed-off-by: Philip Langdale <philipl@overt.org>
4 years agoavutil/colorspace: Remove RGB_TO_Y/U/V
Michael Niedermayer [Sat, 6 Jun 2015 12:57:15 +0000 (14:57 +0200)]
avutil/colorspace: Remove RGB_TO_Y/U/V

They are unused and colorspace.h is not a installed header

Found-by: Timo Rothenpieler <timo@rothenpieler.org>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/exr: fix crash caused by merge
Paul B Mahol [Sat, 6 Jun 2015 15:56:06 +0000 (15:56 +0000)]
avcodec/exr: fix crash caused by merge

Various header informations need to be reset when decoding next frame.
Regression since: 95582b5c

Fixes ticket #4597.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoconfigure: improve the checks for gmtime_r and localtime_r
James Almer [Sat, 6 Jun 2015 04:55:06 +0000 (01:55 -0300)]
configure: improve the checks for gmtime_r and localtime_r

They are inlined wrapper functions inside the time.h header on MinGW-w64, so
neither check_func() or check_func_headers() work with them.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoChangelog: Drop duplicate NVENC entry
Michael Niedermayer [Sat, 6 Jun 2015 12:21:04 +0000 (14:21 +0200)]
Changelog: Drop duplicate NVENC entry

Found-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice/x11grab: use av_clip() instead of nested min & max
Clément Bœsch [Sat, 6 Jun 2015 10:59:46 +0000 (12:59 +0200)]
avdevice/x11grab: use av_clip() instead of nested min & max

Note: [xy]_off and screen_[wh] variables are int, as well as
X11GrabContext.{width,height,x_off,y_off}.

4 years agoavcodec/snowenc: use av_clip() instead of nested min & max
Clément Bœsch [Sat, 6 Jun 2015 10:56:57 +0000 (12:56 +0200)]
avcodec/snowenc: use av_clip() instead of nested min & max

Note: AVCodecContext.refs is an int field.

4 years agoavcodec/mpegvideo: use av_clip() instead of nested min & max
Clément Bœsch [Sat, 6 Jun 2015 10:55:20 +0000 (12:55 +0200)]
avcodec/mpegvideo: use av_clip() instead of nested min & max

Note: MpegEncContext.mb_{y,height} are int fields, as well as local off
variable.

4 years agoffplay: use av_clip() instead of nested min & max
Clément Bœsch [Sat, 6 Jun 2015 10:50:21 +0000 (12:50 +0200)]
ffplay: use av_clip() instead of nested min & max

Note: {wanted,min,max}_samples are int variables.

4 years agohevc: fix typo (mpv -> mvp).
Ronald S. Bultje [Sat, 6 Jun 2015 02:08:45 +0000 (22:08 -0400)]
hevc: fix typo (mpv -> mvp).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Sat, 6 Jun 2015 10:34:00 +0000 (12:34 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavf/http: Add simple autodetection for client HTTP method, based on AVIO_FLAG_READ.
  lavf/http: Indent else-clause.
  lavf/http: Properly process HTTP header on listen.
  lavf/http: Rudimentary error handling for HTTP requests received from clients.
  lavf/http: Process HTTP header before sending response.
  lavf/http: Document method option.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample: fix initilaize/initialize typo
Clément Bœsch [Sat, 6 Jun 2015 10:16:18 +0000 (12:16 +0200)]
swresample: fix initilaize/initialize typo

4 years agodoc/filters: fix inaccuarte/inaccurate typo
Clément Bœsch [Sat, 6 Jun 2015 10:14:42 +0000 (12:14 +0200)]
doc/filters: fix inaccuarte/inaccurate typo

4 years agolavf/http: Add simple autodetection for client HTTP method, based on AVIO_FLAG_READ.
Stephan Holljes [Thu, 4 Jun 2015 22:27:07 +0000 (00:27 +0200)]
lavf/http: Add simple autodetection for client HTTP method, based on AVIO_FLAG_READ.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
4 years agolavf/http: Indent else-clause.
Stephan Holljes [Wed, 3 Jun 2015 23:21:26 +0000 (01:21 +0200)]
lavf/http: Indent else-clause.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
4 years agolavf/http: Properly process HTTP header on listen.
Stephan Holljes [Wed, 3 Jun 2015 23:21:02 +0000 (01:21 +0200)]
lavf/http: Properly process HTTP header on listen.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
4 years agolavf/http: Rudimentary error handling for HTTP requests received from clients.
Stephan Holljes [Wed, 3 Jun 2015 23:20:28 +0000 (01:20 +0200)]
lavf/http: Rudimentary error handling for HTTP requests received from clients.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
4 years agolavf/http: Process HTTP header before sending response.
Stephan Holljes [Wed, 3 Jun 2015 23:17:51 +0000 (01:17 +0200)]
lavf/http: Process HTTP header before sending response.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
4 years agolavf/http: Document method option.
Stephan Holljes [Wed, 3 Jun 2015 23:16:59 +0000 (01:16 +0200)]
lavf/http: Document method option.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
4 years agoavformat/mxfenc: Add mxf muxer avclass
Michael Niedermayer [Fri, 22 May 2015 12:02:51 +0000 (14:02 +0200)]
avformat/mxfenc: Add mxf muxer avclass

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/s302m: Only set the sample rate when some data is output
Michael Niedermayer [Fri, 5 Jun 2015 22:59:16 +0000 (00:59 +0200)]
avcodec/s302m: Only set the sample rate when some data is output

This way ffplay chooses the mp2 stream for Ticket3890

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: Do not select audio streams with unknown sample rate in av_find_best_...
Michael Niedermayer [Fri, 5 Jun 2015 22:55:12 +0000 (00:55 +0200)]
avformat/utils: Do not select audio streams with unknown sample rate in av_find_best_stream()

Together with the next commit this prevents non-PCM S302M from being selected unless either
it can be decoded or the user selects passthrough/copy

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/s302m: Check for non PCM Streams
Michael Niedermayer [Thu, 4 Jun 2015 14:41:18 +0000 (16:41 +0200)]
avcodec/s302m: Check for non PCM Streams

Allow the user to choose what to do with the non PCM data through AVOptions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoflvdec: fix lack of duration for some files
Ganesh Ajjanagadde [Fri, 5 Jun 2015 18:14:58 +0000 (14:14 -0400)]
flvdec: fix lack of duration for some files

Fixes #4579

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/flvdec: Show unknown tags at debug level
Michael Niedermayer [Fri, 5 Jun 2015 19:21:44 +0000 (21:21 +0200)]
avformat/flvdec: Show unknown tags at debug level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/flvdec: Add TYPE_ONCAPTIONINFO
Michael Niedermayer [Fri, 5 Jun 2015 19:18:29 +0000 (21:18 +0200)]
avformat/flvdec: Add TYPE_ONCAPTIONINFO

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/flvdec: increase buffer size for parsing metadata string key
Michael Niedermayer [Fri, 5 Jun 2015 19:07:36 +0000 (21:07 +0200)]
avformat/flvdec: increase buffer size for parsing metadata string key

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoRevert addition of a few fixed_dsp functions to APIChanges
Michael Niedermayer [Fri, 5 Jun 2015 18:06:32 +0000 (20:06 +0200)]
Revert addition of a few fixed_dsp functions to APIChanges

The header is not installed currently so the changes should not be in APIChanges

Found-by: Ronald S. Bultje and others
This reverts part of commit 19ed3e35a5cd188de69f3635f56d9e51c2f720d5.

4 years agoavutil/ppc/cpu: add include avassert.h
Michael Niedermayer [Fri, 5 Jun 2015 17:12:58 +0000 (19:12 +0200)]
avutil/ppc/cpu: add include avassert.h

fix build failure on ppc64

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/softfloat: Fix alternative implementation of av_normalize1_sf()
Michael Niedermayer [Fri, 5 Jun 2015 15:39:42 +0000 (17:39 +0200)]
avutil/softfloat: Fix alternative implementation of av_normalize1_sf()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/softfloat: Fix alternative implementation of av_normalize_sf()
Michael Niedermayer [Fri, 5 Jun 2015 15:36:46 +0000 (17:36 +0200)]
avutil/softfloat: Fix alternative implementation of av_normalize_sf()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoarm: only enable setend on ARMv6
Andreas Cadhalpun [Thu, 4 Jun 2015 21:07:44 +0000 (23:07 +0200)]
arm: only enable setend on ARMv6

Without this check it causes SIGILL crashes on ARMv5.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavutil/softfloat: Move av_sincos_sf() from header to c file
Michael Niedermayer [Fri, 5 Jun 2015 11:30:54 +0000 (13:30 +0200)]
avutil/softfloat: Move av_sincos_sf() from header to c file

The function is quite big and trigonometric functions should not really
be used in speed critical code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavutil/doc: Changes in documentation due to changes to fixed_dsp
Nedeljko Babic [Fri, 5 Jun 2015 09:54:44 +0000 (11:54 +0200)]
libavutil/doc: Changes in documentation due to changes to fixed_dsp

New functions are added to fixed_dsp, so the documentation is changed
accordingly.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/softfloat: Add more tests for the normalization
Michael Niedermayer [Fri, 5 Jun 2015 10:57:06 +0000 (12:57 +0200)]
avutil/softfloat: Add more tests for the normalization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/softfloat: Fix thresholds in av_normalize_sf()
Michael Niedermayer [Fri, 5 Jun 2015 10:56:12 +0000 (12:56 +0200)]
avutil/softfloat: Fix thresholds in av_normalize_sf()

Found-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/rdft: Use more specific error codes
Michael Niedermayer [Fri, 5 Jun 2015 02:05:57 +0000 (04:05 +0200)]
avcodec/rdft: Use more specific error codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/matroskaenc: Write Block Keyframe correctly
Vignesh Venkatasubramanian [Thu, 4 Jun 2015 23:29:49 +0000 (16:29 -0700)]
lavf/matroskaenc: Write Block Keyframe correctly

Per matroska Block Structure [1], for keyframes 0th bit of the flag
should not be set (unlike SimpleBlocks). For Blocks, keyframes is
inferred by the absence of ReferenceBlock element (as done by
matroskadec). This CL writes the flag correctly and inserts the
ReferenceBlock element for non-keyframes. The timestamp inserted is
that of the immediately preceding frame (which is true for VP8 and VP9
- the only 2 codecs using the matroska block element as of now). It
also considers all non-video frames (audio, subtitles, metadata) to
be keyframes.

[1] http://www.matroska.org/technical/specs/index.html#block_structure

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/utils: Assert that audio decoders do not report using more data than was...
Michael Niedermayer [Thu, 4 Jun 2015 20:35:31 +0000 (22:35 +0200)]
avcodec/utils: Assert that audio decoders do not report using more data than was input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/alsdec: Check for overread
Michael Niedermayer [Thu, 4 Jun 2015 20:59:34 +0000 (22:59 +0200)]
avcodec/alsdec: Check for overread

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/atrac3plusdec: consume only as many bytes as available
Michael Niedermayer [Thu, 4 Jun 2015 20:47:24 +0000 (22:47 +0200)]
avcodec/atrac3plusdec: consume only as many bytes as available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/adpcm: Check for overreads
Michael Niedermayer [Thu, 4 Jun 2015 20:34:12 +0000 (22:34 +0200)]
avcodec/adpcm: Check for overreads

See: vlc ticket 14649
Reported-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC idct functions
Shivraj Patil [Thu, 4 Jun 2015 08:01:47 +0000 (13:31 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC idct functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC idct functions in new file hevc_idct_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavutil/softfloat: Fix av_normalize1_sf bias.
Nedeljko Babic [Wed, 3 Jun 2015 14:17:39 +0000 (16:17 +0200)]
libavutil/softfloat: Fix av_normalize1_sf bias.

av_normalize1_sf doesn't properly address border case when mantis is
exactly -0x40000000.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/riffenc: Set correct block align for mp2.
Juanjo [Thu, 4 Jun 2015 12:47:24 +0000 (14:47 +0200)]
lavf/riffenc: Set correct block align for mp2.

Rounding by Michael.

Fixes ticket #4565.

4 years agolavfi/tinterlace: Double aspect ratio for modes merge and pad.
Carl Eugen Hoyos [Thu, 4 Jun 2015 12:11:29 +0000 (14:11 +0200)]
lavfi/tinterlace: Double aspect ratio for modes merge and pad.

4 years agoswresample/resample: fix typos
Michael Niedermayer [Thu, 4 Jun 2015 11:04:09 +0000 (13:04 +0200)]
swresample/resample: fix typos

Found-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/proresenc_anatoliy: Use more specific error codes
Michael Niedermayer [Thu, 4 Jun 2015 10:49:59 +0000 (12:49 +0200)]
avcodec/proresenc_anatoliy: Use more specific error codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/snow: replace unspecific error code
Michael Niedermayer [Thu, 4 Jun 2015 10:39:28 +0000 (12:39 +0200)]
avcodec/snow: replace unspecific error code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample/swresample: Cleanup on init failure.
Michael Niedermayer [Thu, 4 Jun 2015 01:47:55 +0000 (03:47 +0200)]
swresample/swresample: Cleanup on init failure.

This avoids leaks if the user doest call swr_close() after a failed init

Found-by: James Almer <jamrial@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample: Add swr_get_out_samples()
Michael Niedermayer [Tue, 2 Jun 2015 23:22:25 +0000 (01:22 +0200)]
swresample: Add swr_get_out_samples()

Previous version reviewed-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Previous version reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: add missing lavfi indev dependency to closed caption test
James Almer [Thu, 4 Jun 2015 02:34:31 +0000 (23:34 -0300)]
fate: add missing lavfi indev dependency to closed caption test

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agolibswresample/rematrix: Check for malloc errors
Michael Niedermayer [Thu, 4 Jun 2015 00:36:30 +0000 (02:36 +0200)]
libswresample/rematrix: Check for malloc errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: Add Closed caption test
Anshul Maheshwari [Tue, 2 Jun 2015 21:46:10 +0000 (03:16 +0530)]
fate: Add Closed caption test

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavutil: Add new fixed dsp functions.
Nedeljko Babic [Wed, 3 Jun 2015 14:00:36 +0000 (16:00 +0200)]
libavutil: Add new fixed dsp functions.

Add functions needed for implementation of fixed point aac dec.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoRevert "avformat/rtpenc: check av_packet_get_side_data() return, fix null ptr derefer...
Michael Niedermayer [Wed, 3 Jun 2015 20:39:27 +0000 (22:39 +0200)]
Revert "avformat/rtpenc: check av_packet_get_side_data() return, fix null ptr dereference"

This was simply wrong

Found-by: Martin Storsjö
This reverts commit 5d8e4f6da03c0342157e6ac7fab1a8ac3a87a8b0.

4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC uni mc epel functions
Shivraj Patil [Tue, 2 Jun 2015 08:38:12 +0000 (14:08 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC uni mc epel functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC uni mc epel functions.
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC mc epel functions
Shivraj Patil [Tue, 2 Jun 2015 08:38:11 +0000 (14:08 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC mc epel functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC mc epel functions.

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC biw mc functions
Shivraj Patil [Tue, 2 Jun 2015 08:38:10 +0000 (14:08 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC biw mc functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC biw mc functions (qpel as well as epel) in new file hevc_mc_biw_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0289f81241e720452b5a77713488d54d3ec252d7'
Michael Niedermayer [Wed, 3 Jun 2015 17:23:06 +0000 (19:23 +0200)]
Merge commit '0289f81241e720452b5a77713488d54d3ec252d7'

* commit '0289f81241e720452b5a77713488d54d3ec252d7':
  aac: Correctly map multichannel ADTS AAC with non-zero channel_config + PCE

Conflicts:
libavcodec/aacdec.c

Sample: 5.1ch_PCE_issue.aac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7f596368a404363d72b1be6d16c51420a71bc523'
Michael Niedermayer [Wed, 3 Jun 2015 17:03:08 +0000 (19:03 +0200)]
Merge commit '7f596368a404363d72b1be6d16c51420a71bc523'

* commit '7f596368a404363d72b1be6d16c51420a71bc523':
  bink: Factorize bink put_pixel

Conflicts:
libavcodec/bink.c

See: b3675f890abee0bc446495711223a5c790234672
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e97446e600578392549ef6d0191f2020dae7f8bf'
Michael Niedermayer [Wed, 3 Jun 2015 16:51:39 +0000 (18:51 +0200)]
Merge commit 'e97446e600578392549ef6d0191f2020dae7f8bf'

* commit 'e97446e600578392549ef6d0191f2020dae7f8bf':
  configure: Check for DXVA2_ConfigPictureDecode instead of LPDIRECT3DSURFACE9

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b9875b497a38f494acb599083b0d004545958697'
Michael Niedermayer [Wed, 3 Jun 2015 16:41:02 +0000 (18:41 +0200)]
Merge commit 'b9875b497a38f494acb599083b0d004545958697'

* commit 'b9875b497a38f494acb599083b0d004545958697':
  configure: Remove unnecessary tests for d3d11va

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '76eb0950b8d82b1e9617b9c854f091e13bb23131'
Michael Niedermayer [Wed, 3 Jun 2015 16:26:17 +0000 (18:26 +0200)]
Merge commit '76eb0950b8d82b1e9617b9c854f091e13bb23131'

* commit '76eb0950b8d82b1e9617b9c854f091e13bb23131':
  configure: Don't run "export $e" for an empty string

Conflicts:
configure

See: d5db4a7c231975af003de81cf884808da536bc07
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/ppc/cpu: Our code assumes vsx implies altivec, thus assert this
Michael Niedermayer [Wed, 3 Jun 2015 16:14:38 +0000 (18:14 +0200)]
avutil/ppc/cpu: Our code assumes vsx implies altivec, thus assert this

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: Retry same packet on IO failure to avoid loosing a packet
Michael Niedermayer [Wed, 3 Jun 2015 11:04:37 +0000 (13:04 +0200)]
avformat/mov: Retry same packet on IO failure to avoid loosing a packet

Based on patch by: Zhang Rui <bbcallen@gmail.com>
Reviewed-by: Zhang Rui <bbcallen@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg_dxva2: call GetDesktopWindow() in place of GetShellWindow()
Stefano Sabatini [Wed, 27 May 2015 14:33:02 +0000 (16:33 +0200)]
ffmpeg_dxva2: call GetDesktopWindow() in place of GetShellWindow()

This fixes compilation with latest MinGW, it does not seem to affect
MSYS2/MinGW-64.

4 years agoaac: Correctly map multichannel ADTS AAC with non-zero channel_config + PCE
nu774 [Wed, 3 Jun 2015 05:01:32 +0000 (14:01 +0900)]
aac: Correctly map multichannel ADTS AAC with non-zero channel_config + PCE

The decoder assigns channels using default channel configuration
for 5.1ch when it parses an ADTS frame header using consecutive
channel ids.

When a PCE comes, it reassigns channels using PCE configuration
using directly the ids provided. They can be arbitrary.

Always use consecutive channel ids to avoid decoding glitches due
spurious reconfigurations due the channel ids mismatch between the
two otherwise-identical channel maps.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoavfilter/vf_blend: add linearlight and glow mode
Paul B Mahol [Wed, 3 Jun 2015 12:23:59 +0000 (12:23 +0000)]
avfilter/vf_blend: add linearlight and glow mode

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agobink: Factorize bink put_pixel
Luca Barbato [Wed, 3 Jun 2015 00:09:31 +0000 (02:09 +0200)]
bink: Factorize bink put_pixel

And make sure to check INTER_BLOCK as had been fixed by Michael
Niedermayer.

Reported-By: Andreas Cadhalpun
CC: libav-stable@libav.org
4 years agoconfigure: Check for DXVA2_ConfigPictureDecode instead of LPDIRECT3DSURFACE9
Martin Storsjö [Tue, 2 Jun 2015 07:15:57 +0000 (10:15 +0300)]
configure: Check for DXVA2_ConfigPictureDecode instead of LPDIRECT3DSURFACE9

Checking this struct is a bit more natural for this dependency.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoconfigure: Remove unnecessary tests for d3d11va
Martin Storsjö [Tue, 2 Jun 2015 07:12:51 +0000 (10:12 +0300)]
configure: Remove unnecessary tests for d3d11va

These are only necessary once/if avconv gets support for this hwaccel.
While that obviously is desireable, we don't have it yet, and they
currently only are a distraction.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoconfigure: Don't run "export $e" for an empty string
Martin Storsjö [Tue, 2 Jun 2015 19:55:52 +0000 (22:55 +0300)]
configure: Don't run "export $e" for an empty string

This fixes the side effect of printing the whole environment,
if no --env parameter was provided.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC uniw mc functions
Shivraj Patil [Tue, 2 Jun 2015 08:38:09 +0000 (14:08 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC uniw mc functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC uniw mc functions (qpel as well as epel) in new file hevc_mc_uniw_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mxfenc: Accept MXF D-10 with 49.999840 Mbit/sec
Michael Niedermayer [Mon, 1 Jun 2015 19:35:02 +0000 (21:35 +0200)]
avformat/mxfenc: Accept MXF D-10 with 49.999840 Mbit/sec

This is the maximum rate possible based on the frame size limit of MXF D-10

Previous version reviewed by tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample/dither: check memory allocation
Ganesh Ajjanagadde [Wed, 3 Jun 2015 03:17:48 +0000 (23:17 -0400)]
swresample/dither: check memory allocation

check memory allocation in swri_get_dither()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/apng: Remove blending support for AV_PIX_FMT_ARGB
Donny Yang [Tue, 2 Jun 2015 15:49:22 +0000 (15:49 +0000)]
avcodec/apng: Remove blending support for AV_PIX_FMT_ARGB

ARGB is not a supported PNG pixel format

Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample: Check the return value of resampler->init()
Michael Niedermayer [Tue, 2 Jun 2015 22:48:29 +0000 (00:48 +0200)]
swresample: Check the return value of resampler->init()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de'
Michael Niedermayer [Tue, 2 Jun 2015 20:41:53 +0000 (22:41 +0200)]
Merge commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de'

* commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de':
  configure: don't enable tls protocols if network is disabled

Conflicts:
configure

See: 7fc6545d5d7301196d1c23a45a24a9707bac0060
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibopenjpegdec: register logging callback functions
Andreas Cadhalpun [Sat, 30 May 2015 17:40:22 +0000 (19:40 +0200)]
libopenjpegdec: register logging callback functions

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agolibopenjpegenc: use variable instead of type for sizeof
Andreas Cadhalpun [Sun, 31 May 2015 22:16:29 +0000 (00:16 +0200)]
libopenjpegenc: use variable instead of type for sizeof

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agolibopenjpegenc: add NULL check for img before accessing it
Andreas Cadhalpun [Sun, 31 May 2015 22:51:30 +0000 (00:51 +0200)]
libopenjpegenc: add NULL check for img before accessing it

If opj_image_create fails to allocate an image it returns NULL, which
causes a segmentation fault at 'img->x0 = 0'.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoconfigure: Remove now redundant vsx setting code
Michael Niedermayer [Tue, 2 Jun 2015 20:14:06 +0000 (22:14 +0200)]
configure: Remove now redundant vsx setting code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: don't enable tls protocols if network is disabled
James Almer [Tue, 2 Jun 2015 16:24:21 +0000 (13:24 -0300)]
configure: don't enable tls protocols if network is disabled

This was a regression introduced with d8ffb2055f0e0fcb5d025bab72eb19c2a886c125.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavfilter/vf_blend: add hardmix mode
Paul B Mahol [Tue, 2 Jun 2015 19:12:45 +0000 (19:12 +0000)]
avfilter/vf_blend: add hardmix mode

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/vf_blend: fix vividlight blend mode
Paul B Mahol [Tue, 2 Jun 2015 18:54:37 +0000 (18:54 +0000)]
avfilter/vf_blend: fix vividlight blend mode

Pointed-out-by: Rudolf Polzer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/vf_blend: clip result for divide blend mode
Paul B Mahol [Tue, 2 Jun 2015 18:48:32 +0000 (18:48 +0000)]
avfilter/vf_blend: clip result for divide blend mode

Pointed-out-by: Rudolf Polzer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoconfigure: Do not dump the whole environment to stdout
Michael Niedermayer [Tue, 2 Jun 2015 17:53:17 +0000 (19:53 +0200)]
configure: Do not dump the whole environment to stdout

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d'
Michael Niedermayer [Tue, 2 Jun 2015 17:14:40 +0000 (19:14 +0200)]
Merge commit 'fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d'

* commit 'fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d':
  configure: Use pkg-config for fdk-aac

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '604abd025dac4cc73a2f6b0c000c3695c16fb000'
Michael Niedermayer [Tue, 2 Jun 2015 17:03:02 +0000 (19:03 +0200)]
Merge commit '604abd025dac4cc73a2f6b0c000c3695c16fb000'

* commit '604abd025dac4cc73a2f6b0c000c3695c16fb000':
  configure: Provide an option to override the environment

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '06db45523c1068c24f049ef2b20fcdead3bf36d8'
Michael Niedermayer [Tue, 2 Jun 2015 16:54:57 +0000 (18:54 +0200)]
Merge commit '06db45523c1068c24f049ef2b20fcdead3bf36d8'

* commit '06db45523c1068c24f049ef2b20fcdead3bf36d8':
  configure: Support the extended pkgconf syntax

Conflicts:
configure

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