ffmpeg.git
4 years agoMerge commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99'
Michael Niedermayer [Fri, 20 Feb 2015 21:12:29 +0000 (22:12 +0100)]
Merge commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99'

* commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99':
  libavresample: Annotate AARCH64 init function with av_cold

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7'
Michael Niedermayer [Fri, 20 Feb 2015 21:03:54 +0000 (22:03 +0100)]
Merge commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7'

* commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7':
  rtpdec_h264: Move a leftover comment into h264_handle_packet_stap_a

Conflicts:
libavformat/rtpdec_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a335ed767161c6da2815371177cfd5e40f78e5b7'
Michael Niedermayer [Fri, 20 Feb 2015 20:57:30 +0000 (21:57 +0100)]
Merge commit 'a335ed767161c6da2815371177cfd5e40f78e5b7'

* commit 'a335ed767161c6da2815371177cfd5e40f78e5b7':
  rtpdec_h264: Remove an unnecessary check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '176903ce833ce7469f411640e9748a0d549b5285'
Michael Niedermayer [Fri, 20 Feb 2015 20:48:14 +0000 (21:48 +0100)]
Merge commit '176903ce833ce7469f411640e9748a0d549b5285'

* commit '176903ce833ce7469f411640e9748a0d549b5285':
  rtpdec_h264: Return immediately on errors in h264_handle_packet_stap_a

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'bb8c6ac840afa69dd37860fdf85da9f4cf1e0ae4'
Michael Niedermayer [Fri, 20 Feb 2015 20:40:07 +0000 (21:40 +0100)]
Merge commit 'bb8c6ac840afa69dd37860fdf85da9f4cf1e0ae4'

* commit 'bb8c6ac840afa69dd37860fdf85da9f4cf1e0ae4':
  rtpdec_h264: Make a parameter pointer const

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7650caf013f45ebebf128855735a0c6350836ea4'
Michael Niedermayer [Fri, 20 Feb 2015 20:30:01 +0000 (21:30 +0100)]
Merge commit '7650caf013f45ebebf128855735a0c6350836ea4'

* commit '7650caf013f45ebebf128855735a0c6350836ea4':
  rtpdec_h264: Use av_realloc instead of av_malloc+mempcy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8bdbf49c6f4d9473183a3c45ec70d611eb6183cd'
Michael Niedermayer [Fri, 20 Feb 2015 20:23:07 +0000 (21:23 +0100)]
Merge commit '8bdbf49c6f4d9473183a3c45ec70d611eb6183cd'

* commit '8bdbf49c6f4d9473183a3c45ec70d611eb6183cd':
  rtpdec_h264: Include the right header for AV_RB16

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ba2e07909b848e583245856a59d0fe1dd08f917e'
Michael Niedermayer [Fri, 20 Feb 2015 20:14:53 +0000 (21:14 +0100)]
Merge commit 'ba2e07909b848e583245856a59d0fe1dd08f917e'

* commit 'ba2e07909b848e583245856a59d0fe1dd08f917e':
  rtpdec_vp8: Set the keyframe flag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/omadec: Use 64bit for ret to avoid overflow
Michael Niedermayer [Fri, 20 Feb 2015 20:01:54 +0000 (21:01 +0100)]
avformat/omadec: Use 64bit for ret to avoid overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/vqf: Use 64bit for ret to avoid overflow
Michael Niedermayer [Fri, 20 Feb 2015 20:00:57 +0000 (21:00 +0100)]
avformat/vqf: Use 64bit for ret to avoid overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/wtvdec: Use 64bit for ret to avoid overflow
Michael Niedermayer [Fri, 20 Feb 2015 19:57:31 +0000 (20:57 +0100)]
avformat/wtvdec: Use 64bit for ret to avoid overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mvdec: Use 64bit for ret to avoid overflow
Michael Niedermayer [Fri, 20 Feb 2015 19:41:35 +0000 (20:41 +0100)]
avformat/mvdec: Use 64bit for ret to avoid overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/apngdec: Use 64bit for ret to avoid overflow
Michael Niedermayer [Fri, 20 Feb 2015 19:38:14 +0000 (20:38 +0100)]
avformat/apngdec: Use 64bit for ret to avoid overflow

Missed this hunk in first commit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/gxf: Use 64bit for res to avoid overflow
Michael Niedermayer [Fri, 20 Feb 2015 19:14:56 +0000 (20:14 +0100)]
avformat/gxf: Use 64bit for res to avoid overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/idcin: Use 64bit for ret to avoid overflow
Michael Niedermayer [Fri, 20 Feb 2015 19:13:06 +0000 (20:13 +0100)]
avformat/idcin: Use 64bit for ret to avoid overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/apngdec: Use 64bit ret to avoid overflow
Michael Niedermayer [Fri, 20 Feb 2015 18:31:10 +0000 (19:31 +0100)]
avformat/apngdec: Use 64bit ret to avoid overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/asfdec: Use 64bit ret to avoid overflow
Michael Niedermayer [Fri, 20 Feb 2015 18:29:12 +0000 (19:29 +0100)]
avformat/asfdec: Use 64bit ret to avoid overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agowtvdec: fix integer overflow resulting in errors with large files
Rodger Combs [Fri, 20 Feb 2015 15:30:04 +0000 (09:30 -0600)]
wtvdec: fix integer overflow resulting in errors with large files

This fixes a regression in 9fbc613f0df1628e7e78bca791fa8833846f8210

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavresample: Annotate AARCH64 init function with av_cold
Peter Meerwald [Thu, 19 Feb 2015 22:28:27 +0000 (23:28 +0100)]
libavresample: Annotate AARCH64 init function with av_cold

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_h264: Move a leftover comment into h264_handle_packet_stap_a
Martin Storsjö [Thu, 19 Feb 2015 19:49:18 +0000 (21:49 +0200)]
rtpdec_h264: Move a leftover comment into h264_handle_packet_stap_a

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_h264: Remove an unnecessary check
Martin Storsjö [Thu, 19 Feb 2015 19:28:58 +0000 (21:28 +0200)]
rtpdec_h264: Remove an unnecessary check

If src_len is too small for nal_size, we already print a warning
above, and the next step is to check the while loop condition
anyway, so this one serves no purpose.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_h264: Return immediately on errors in h264_handle_packet_stap_a
Martin Storsjö [Thu, 19 Feb 2015 19:28:01 +0000 (21:28 +0200)]
rtpdec_h264: Return immediately on errors in h264_handle_packet_stap_a

Previously, errors were only logged but the code kept on trying,
and never actually returning the error as a return value.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_h264: Make a parameter pointer const
Martin Storsjö [Thu, 19 Feb 2015 19:14:05 +0000 (21:14 +0200)]
rtpdec_h264: Make a parameter pointer const

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_h264: Use av_realloc instead of av_malloc+mempcy
Martin Storsjö [Thu, 19 Feb 2015 19:12:06 +0000 (21:12 +0200)]
rtpdec_h264: Use av_realloc instead of av_malloc+mempcy

This is similar to what was done for rtpdec_hevc in ced7238cd01.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_h264: Include the right header for AV_RB16
Martin Storsjö [Thu, 19 Feb 2015 19:04:45 +0000 (21:04 +0200)]
rtpdec_h264: Include the right header for AV_RB16

Including libavcodec/get_bits.h is superfluous for AV_RB16 - nothing
in this file uses any actual bitstream reader.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_vp8: Set the keyframe flag
Martin Storsjö [Fri, 20 Feb 2015 14:17:44 +0000 (16:17 +0200)]
rtpdec_vp8: Set the keyframe flag

This allows the output to be used with stream copy, which discards
packet from the start until the first keyframe.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoMAINTAINERS: Add Oleksij as maintainer for DSS*
Michael Niedermayer [Fri, 20 Feb 2015 15:17:46 +0000 (16:17 +0100)]
MAINTAINERS: Add Oleksij as maintainer for DSS*

Also add a 2nd maintainer at the authors request (due to lack of time)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohlsenc: remove the AVIOContext for the playlist from the muxer context
Hendrik Leppkes [Fri, 20 Feb 2015 11:55:13 +0000 (12:55 +0100)]
hlsenc: remove the AVIOContext for the playlist from the muxer context

Its only used in one function, having it in the context serves no purpose.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/movenc: Move avid DNxHD padding to the correct spot
Kevin Wheatley [Mon, 16 Feb 2015 10:40:36 +0000 (10:40 +0000)]
avformat/movenc: Move avid DNxHD padding to the correct spot

Outputting DNxHD into .mov containers 'corrupts' following atoms until end of stsd

ffmpeg and qtdump could not decode pasp/colr atoms in the files made by ffmpeg,
when outputting DNxHD due to the incorrect padding placement. Now we add the
padding in the correct place

Tidy up FATE changes due to padding changes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dca: move remaining tables to dcadata
Michael Niedermayer [Fri, 20 Feb 2015 10:11:33 +0000 (11:11 +0100)]
avcodec/dca: move remaining tables to dcadata

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/snowdec: Fix avmv_index increment
Michael Niedermayer [Fri, 20 Feb 2015 02:19:02 +0000 (03:19 +0100)]
avcodec/snowdec: Fix avmv_index increment

Fixes reading uninitialized memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_eq: Add process_command to eq.
Arwa Arif [Wed, 18 Feb 2015 19:56:44 +0000 (01:26 +0530)]
avfilter/vf_eq: Add process_command to eq.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dss_sp: Avoid a slow division and modulo in the pitch_lag calculation
Michael Niedermayer [Thu, 19 Feb 2015 21:49:57 +0000 (22:49 +0100)]
avcodec/dss_sp: Avoid a slow division and modulo in the pitch_lag calculation

Also check the combined_pitch for validity (which is needed to keep the behavior
identical in the error case)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dss_sp: de-obfuscate index inversion
Michael Niedermayer [Thu, 19 Feb 2015 21:41:41 +0000 (22:41 +0100)]
avcodec/dss_sp: de-obfuscate index inversion

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dss_sp: Protect DSS_SP_FORMULA() with a set of outside brackets
Michael Niedermayer [Thu, 19 Feb 2015 21:29:02 +0000 (22:29 +0100)]
avcodec/dss_sp: Protect DSS_SP_FORMULA() with a set of outside brackets

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/dss: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Thu, 19 Feb 2015 21:15:22 +0000 (22:15 +0100)]
avformat/dss: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/dss: Check sscanf() return value in dss_read_metadata_date()
Michael Niedermayer [Thu, 19 Feb 2015 21:10:47 +0000 (22:10 +0100)]
avformat/dss: Check sscanf() return value in dss_read_metadata_date()

Fixes writing uninitialized values into metadata without error in case
parsing fails

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c'
Michael Niedermayer [Thu, 19 Feb 2015 20:53:39 +0000 (21:53 +0100)]
Merge commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c'

* commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c':
  fate: Add tests for DSS

Conflicts:
tests/fate/audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499'
Michael Niedermayer [Thu, 19 Feb 2015 20:44:58 +0000 (21:44 +0100)]
Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499'

* commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499':
  lavf: Add DSS demuxer

Conflicts:
libavformat/Makefile
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b'
Michael Niedermayer [Thu, 19 Feb 2015 20:31:26 +0000 (21:31 +0100)]
Merge commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b'

* commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b':
  lavc: Add DSS SP decoder

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'
Michael Niedermayer [Thu, 19 Feb 2015 20:12:29 +0000 (21:12 +0100)]
Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'

* commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23':
  qsv_api: fix building with libmfx disabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d'
Michael Niedermayer [Thu, 19 Feb 2015 20:12:16 +0000 (21:12 +0100)]
Merge commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d'

* commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d':
  configure: add missing h264_qsv hwaccel deps

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6'
Michael Niedermayer [Thu, 19 Feb 2015 19:52:29 +0000 (20:52 +0100)]
Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6'

* commit '4e08c821106fc1d6d358864abf0d8488b12f38c6':
  lavc: add an Intel libmfx-based H.264 decoder

Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '31d2039cb42668ebcf08248bc48bbad44aa05f49'
Michael Niedermayer [Thu, 19 Feb 2015 19:39:04 +0000 (20:39 +0100)]
Merge commit '31d2039cb42668ebcf08248bc48bbad44aa05f49'

* commit '31d2039cb42668ebcf08248bc48bbad44aa05f49':
  h264_parser: export video format and dimensions

Conflicts:
libavcodec/h264_parser.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a'
Michael Niedermayer [Thu, 19 Feb 2015 19:23:48 +0000 (20:23 +0100)]
Merge commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a'

* commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a':
  pixfmt: add a pixel format for QSV hwaccel

Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: Add tests for DSS
Vittorio Giovara [Fri, 13 Feb 2015 07:36:18 +0000 (08:36 +0100)]
fate: Add tests for DSS

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
4 years agolavf: Add DSS demuxer
Oleksij Rempel [Fri, 13 Feb 2015 07:36:17 +0000 (08:36 +0100)]
lavf: Add DSS demuxer

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agolavc: Add DSS SP decoder
Oleksij Rempel [Fri, 13 Feb 2015 07:36:16 +0000 (08:36 +0100)]
lavc: Add DSS SP decoder

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoqsv_api: fix building with libmfx disabled
Anton Khirnov [Thu, 19 Feb 2015 16:35:34 +0000 (17:35 +0100)]
qsv_api: fix building with libmfx disabled

4 years agoconfigure: add missing h264_qsv hwaccel deps
Anton Khirnov [Thu, 19 Feb 2015 16:32:55 +0000 (17:32 +0100)]
configure: add missing h264_qsv hwaccel deps

4 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Thu, 19 Feb 2015 15:36:48 +0000 (16:36 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  doc/faq: explain DAR/SAR preserving.
  doc: set documentencoding on toplevel texi files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: Add simple ACLR atom reading to set the color range of the incomming...
Kevin Wheatley [Thu, 19 Feb 2015 11:08:14 +0000 (11:08 +0000)]
avformat/mov: Add simple ACLR atom reading to set the color range of the incomming track for codec's like DNxHD that utilise AVID's proprietary atom.

On input ACLR will be used to set colour range no matter which codec
it is associated with.
No change for when it will be output.

Rework mov_read_extradata function to allow detection of truncated
atom reads by callers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc: add an Intel libmfx-based H.264 decoder
Anton Khirnov [Tue, 10 Feb 2015 09:40:59 +0000 (10:40 +0100)]
lavc: add an Intel libmfx-based H.264 decoder

Based on the code by Luca Barbato <lu_zero@gentoo.org> and Yukinori
Yamazoe <drocon11@gmail.com>.

4 years agoh264_parser: export video format and dimensions
Anton Khirnov [Mon, 9 Feb 2015 13:41:50 +0000 (14:41 +0100)]
h264_parser: export video format and dimensions

4 years agopixfmt: add a pixel format for QSV hwaccel
Anton Khirnov [Sat, 7 Feb 2015 11:14:45 +0000 (12:14 +0100)]
pixfmt: add a pixel format for QSV hwaccel

4 years agodoc/faq: explain DAR/SAR preserving.
Nicolas George [Mon, 9 Feb 2015 15:17:22 +0000 (16:17 +0100)]
doc/faq: explain DAR/SAR preserving.

4 years agodoc: set documentencoding on toplevel texi files.
Nicolas George [Mon, 9 Feb 2015 15:17:44 +0000 (16:17 +0100)]
doc: set documentencoding on toplevel texi files.

Fix double UTF-8 encoding on output files.
makeinfo / texi2any does not seem to provide a way of setting
it globally for toplevel files.

4 years agoavfilter/palettegen: raise cache size from 64k to 512k
Clément Bœsch [Thu, 19 Feb 2015 10:17:43 +0000 (11:17 +0100)]
avfilter/palettegen: raise cache size from 64k to 512k

(or 32k to 256k in 32-bit)

This is similar to a00bab347518d4824d51ec7078f1d84ca097c53b

4 years agoMerge commit '0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5'
Michael Niedermayer [Thu, 19 Feb 2015 09:51:19 +0000 (10:51 +0100)]
Merge commit '0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5'

* commit '0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5':
  rv40: Return more meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agorv40: Return more meaningful error codes
Himangi Saraogi [Thu, 19 Feb 2015 07:14:19 +0000 (12:44 +0530)]
rv40: Return more meaningful error codes

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agoavcodec/wmalosslessdec: use sizeof() instead of a literal number
Michael Niedermayer [Thu, 19 Feb 2015 02:14:50 +0000 (03:14 +0100)]
avcodec/wmalosslessdec: use sizeof() instead of a literal number

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_subtitles: Add () to protect the argument of the AA() macro
Michael Niedermayer [Thu, 19 Feb 2015 00:51:54 +0000 (01:51 +0100)]
avfilter/vf_subtitles: Add () to protect the argument of the AA() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/sha: Protect macro arguments with ()
Michael Niedermayer [Wed, 18 Feb 2015 21:50:41 +0000 (22:50 +0100)]
avutil/sha: Protect macro arguments with ()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg_opt: Add missing MATCH_PER_TYPE_OPT() for data codecs
Michael Niedermayer [Wed, 18 Feb 2015 21:12:12 +0000 (22:12 +0100)]
ffmpeg_opt: Add missing MATCH_PER_TYPE_OPT() for data codecs

Fixes: CID1270809

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd617e77cecc5b363ef1860955b548f4ac007add6'
Michael Niedermayer [Wed, 18 Feb 2015 19:35:06 +0000 (20:35 +0100)]
Merge commit 'd617e77cecc5b363ef1860955b548f4ac007add6'

* commit 'd617e77cecc5b363ef1860955b548f4ac007add6':
  libx265: Add crf private option

See: 8b96e8dd28c83448c9b4af81b834deb9b525be80
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2de887e45b664f44b51686f5979fa8ce6dfe2ec2'
Michael Niedermayer [Wed, 18 Feb 2015 19:25:41 +0000 (20:25 +0100)]
Merge commit '2de887e45b664f44b51686f5979fa8ce6dfe2ec2'

* commit '2de887e45b664f44b51686f5979fa8ce6dfe2ec2':
  libx265: Reduce the scope of some variables

See: b920db67317a31f0e8d4a010faa26dbd12b0dcdb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests: fate: adding fate-test for twofish
Supraja Meedinti [Wed, 18 Feb 2015 13:13:03 +0000 (18:43 +0530)]
tests: fate: adding fate-test for twofish

Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/movenc: Fix use of uninitialized variable (ret)
Michael Niedermayer [Wed, 18 Feb 2015 15:18:26 +0000 (16:18 +0100)]
avformat/movenc: Fix use of uninitialized variable (ret)

Fixed CID1270823

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibx265: Add crf private option
Derek Buitenhuis [Tue, 17 Feb 2015 22:04:53 +0000 (17:04 -0500)]
libx265: Add crf private option

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agolibx265: Reduce the scope of some variables
Derek Buitenhuis [Tue, 17 Feb 2015 22:04:51 +0000 (17:04 -0500)]
libx265: Reduce the scope of some variables

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agolibx265: Add crf private option
Derek Buitenhuis [Tue, 17 Feb 2015 22:04:53 +0000 (17:04 -0500)]
libx265: Add crf private option

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agolibx265: Reduce the scope of some variables
Derek Buitenhuis [Tue, 17 Feb 2015 22:04:51 +0000 (17:04 -0500)]
libx265: Reduce the scope of some variables

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoavformat/ffmenc: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Wed, 18 Feb 2015 13:31:11 +0000 (14:31 +0100)]
avformat/ffmenc: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/ffmenc: Fix memleak of buf
Michael Niedermayer [Wed, 18 Feb 2015 13:30:15 +0000 (14:30 +0100)]
avformat/ffmenc: Fix memleak of buf

Fixes CID1257015

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/showpalette: fix leak in case of error
Clément Bœsch [Wed, 18 Feb 2015 12:55:47 +0000 (13:55 +0100)]
avfilter/showpalette: fix leak in case of error

Fixes CID1270820
Fixes CID1270818

4 years agoavfilter/palettegen: fix leak in case of error
Clément Bœsch [Wed, 18 Feb 2015 12:52:36 +0000 (13:52 +0100)]
avfilter/palettegen: fix leak in case of error

4 years agoavfilter/paletteuse: fix leak in case of error
Clément Bœsch [Wed, 18 Feb 2015 12:48:41 +0000 (13:48 +0100)]
avfilter/paletteuse: fix leak in case of error

Fixes CID1270819

4 years agoavfilter/af_channelmap: Move potential dereference after NULL check in get_channel_idx()
Michael Niedermayer [Wed, 18 Feb 2015 12:40:39 +0000 (13:40 +0100)]
avfilter/af_channelmap: Move potential dereference after NULL check in get_channel_idx()

Fixes CID1270822

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_qp: Fix leak of out_qp_table_buf
Michael Niedermayer [Wed, 18 Feb 2015 12:12:06 +0000 (13:12 +0100)]
avfilter/vf_qp: Fix leak of out_qp_table_buf

Fixes CID1270821

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/avfiltergraph: assert that the heap_bubble index is valid
Michael Niedermayer [Wed, 18 Feb 2015 10:55:44 +0000 (11:55 +0100)]
avfilter/avfiltergraph: assert that the heap_bubble index is valid

This might help coverity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/faxcompr: Fix memleak
Michael Niedermayer [Wed, 18 Feb 2015 10:20:39 +0000 (11:20 +0100)]
avcodec/faxcompr: Fix memleak

Fixes CID1270816

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/opusdec: remove unused headers
Paul B Mahol [Tue, 17 Feb 2015 17:31:47 +0000 (17:31 +0000)]
avcodec/opusdec: remove unused headers

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/vf_removelogo: Add () to protect the argument of apply_mask_fudge_factor()
Michael Niedermayer [Wed, 18 Feb 2015 00:56:19 +0000 (01:56 +0100)]
avfilter/vf_removelogo: Add () to protect the argument of apply_mask_fudge_factor()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/bayer_template: Add () to protect the argument of BAYER_READ()
Michael Niedermayer [Wed, 18 Feb 2015 00:55:15 +0000 (01:55 +0100)]
swscale/bayer_template: Add () to protect the argument of BAYER_READ()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agocompat/avisynth/windowsPorts/windows2linux: Add () to protect macro arguments
Michael Niedermayer [Wed, 18 Feb 2015 00:39:57 +0000 (01:39 +0100)]
compat/avisynth/windowsPorts/windows2linux: Add () to protect macro arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/wavpack: Add () to protect the arguments of UPDATE_WEIGHT_CLIP()
Michael Niedermayer [Wed, 18 Feb 2015 00:37:06 +0000 (01:37 +0100)]
avcodec/wavpack: Add () to protect the arguments of UPDATE_WEIGHT_CLIP()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/wmalosslessdec: Add () to protect the arguments of WMASIGN()
Michael Niedermayer [Wed, 18 Feb 2015 00:34:50 +0000 (01:34 +0100)]
avcodec/wmalosslessdec: Add () to protect the arguments of WMASIGN()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavutil: optimize twofish cipher
Supraja Meedinti [Tue, 17 Feb 2015 19:18:53 +0000 (00:48 +0530)]
libavutil: optimize twofish cipher

before:
lavu       TWOFISH      size: 1048576  runs:   1024  time:   90.052 +- 4.630
after:
lavu       TWOFISH      size: 1048576  runs:   1024  time:   18.085 +- 0.241
gcrypt     TWOFISH      size: 1048576  runs:   1024  time:   25.666 +- 0.307
tomcrypt   TWOFISH      size: 1048576  runs:   1024  time:   18.428 +- 0.363

Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d'
Michael Niedermayer [Tue, 17 Feb 2015 22:50:56 +0000 (23:50 +0100)]
Merge commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d'

* commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d':
  riff: Support QT RLE Animation in avi ('rle ' FourCC)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4'
Michael Niedermayer [Tue, 17 Feb 2015 22:42:26 +0000 (23:42 +0100)]
Merge commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4'

* commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4':
  riff: Support ProRes in avi (APCH fourcc)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd'
Michael Niedermayer [Tue, 17 Feb 2015 22:34:36 +0000 (23:34 +0100)]
Merge commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd'

* commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd':
  wmv2: Return meaningful error codes

Conflicts:
libavcodec/wmv2dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2'
Michael Niedermayer [Tue, 17 Feb 2015 22:26:28 +0000 (23:26 +0100)]
Merge commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2'

* commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2':
  qdm2: Return meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012'
Michael Niedermayer [Tue, 17 Feb 2015 22:12:29 +0000 (23:12 +0100)]
Merge commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012'

* commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012':
  libxvid: Return meaningful error messages

Conflicts:
libavcodec/libxvid.c
libavcodec/libxvid_rc.c

See: 2a89afb376aebe833bee0b5958cec16c48936b03 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/aac_adtstoasc_bsf: Clear extradata_size on allocation failure
Michael Niedermayer [Tue, 17 Feb 2015 21:58:31 +0000 (22:58 +0100)]
avcodec/aac_adtstoasc_bsf: Clear extradata_size on allocation failure

This keeps the fields consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d'
Michael Niedermayer [Tue, 17 Feb 2015 21:54:56 +0000 (22:54 +0100)]
Merge commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d'

* commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d':
  aac_adtstoasc_bsf: Check extradata memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc'
Michael Niedermayer [Tue, 17 Feb 2015 21:46:59 +0000 (22:46 +0100)]
Merge commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc'

* commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc':
  avpacket: Check buffer reference

Conflicts:
libavcodec/avpacket.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46'
Michael Niedermayer [Tue, 17 Feb 2015 21:39:32 +0000 (22:39 +0100)]
Merge commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46'

* commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46':
  vorbisdec: Check memory allocations

Conflicts:
libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11'
Michael Niedermayer [Tue, 17 Feb 2015 21:30:58 +0000 (22:30 +0100)]
Merge commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11'

* commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11':
  dvdsubdec: Check memory allocations

Conflicts:
libavcodec/dvdsubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e51f22122d23589e93ac4f0b3e570bb925755915'
Michael Niedermayer [Tue, 17 Feb 2015 21:21:22 +0000 (22:21 +0100)]
Merge commit 'e51f22122d23589e93ac4f0b3e570bb925755915'

* commit 'e51f22122d23589e93ac4f0b3e570bb925755915':
  swscale: Check memory allocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3035d21b5a77df0e9531df397fc06d59488996c7'
Michael Niedermayer [Tue, 17 Feb 2015 21:08:46 +0000 (22:08 +0100)]
Merge commit '3035d21b5a77df0e9531df397fc06d59488996c7'

* commit '3035d21b5a77df0e9531df397fc06d59488996c7':
  nutdec: Check memory allocations

Conflicts:
libavformat/nutdec.c

See: 55ae13e3deffa21027a44f31b4ae2f53a4fa7426
See: 269845db86d994c7d43c3ad6eabd4fde5bb391ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>