ffmpeg.git
6 years agoavcodec/wavpack: initialize pointers to silence warning about them possibly being...
Michael Niedermayer [Wed, 7 May 2014 00:13:56 +0000 (02:13 +0200)]
avcodec/wavpack: initialize pointers to silence warning about them possibly being uninitialized

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: remove unused variable
Michael Niedermayer [Wed, 7 May 2014 00:07:12 +0000 (02:07 +0200)]
avcodec/hevc: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswresample/resample: add missing xmm clobbers
James Almer [Tue, 6 May 2014 23:10:14 +0000 (20:10 -0300)]
swresample/resample: add missing xmm clobbers

Might fix fate-swr on ICL

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7ce3bd9614717e545af8fb8455032c807e389b78'
Michael Niedermayer [Tue, 6 May 2014 22:39:26 +0000 (00:39 +0200)]
Merge commit '7ce3bd9614717e545af8fb8455032c807e389b78'

* commit '7ce3bd9614717e545af8fb8455032c807e389b78':
  rtmpproto: Support alternative slist parameter in rtmp URLs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortmpproto: Support alternative slist parameter in rtmp URLs
Uwe L. Korn [Mon, 5 May 2014 20:47:05 +0000 (21:47 +0100)]
rtmpproto: Support alternative slist parameter in rtmp URLs

Support the URL scheme where the playpath is in an RTMP URL is
passed as the slist argument and the app is given infront of the
query part of the URL:

rtmp://host[:port]/[app]?slist=[playpath]

(other arguments in the query part are stripped as they are not used)

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavcodec/x86/hevcdsp_init: fix SSE4 checks
Michael Niedermayer [Tue, 6 May 2014 16:27:49 +0000 (18:27 +0200)]
avcodec/x86/hevcdsp_init: fix SSE4 checks

Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/Makefile: remove duplicate line
Michael Niedermayer [Tue, 6 May 2014 15:39:19 +0000 (17:39 +0200)]
avcodec/x86/Makefile: remove duplicate line

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/hevcdsp_init: fix build on 32bit
Michael Niedermayer [Tue, 6 May 2014 15:38:20 +0000 (17:38 +0200)]
avcodec/x86/hevcdsp_init: fix build on 32bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoHEVC : added assembly MC functions
plepere [Mon, 28 Apr 2014 14:12:28 +0000 (16:12 +0200)]
HEVC : added assembly MC functions

pretty print x86

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: C code update for new motion compensation
Mickaël Raulet [Sat, 26 Apr 2014 13:35:23 +0000 (15:35 +0200)]
hevc: C code update for new motion compensation

pretty print C

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Tue, 6 May 2014 13:39:47 +0000 (15:39 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  mpegts: always reset pes packet state on new packet
  mpegts: unref buffer in reset_pes_packet_state
  mpegts: factorize pes packet state reset function
  mpegts: fix indentation after last commit
  mpegts: only emit new packets if data buffer exists
  mpegts: remove uneeded buf_size check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/mpegaudiodsp.c: msvc compilation error without sse/avx_external
Matt Oliver [Tue, 6 May 2014 04:42:38 +0000 (14:42 +1000)]
x86/mpegaudiodsp.c: msvc compilation error without sse/avx_external

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogitignore: add tools/uncoded_frame
Lukasz Marek [Tue, 6 May 2014 03:23:37 +0000 (05:23 +0200)]
gitignore: add tools/uncoded_frame

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg4videoenc: fix alternative implementation of mpeg4_encode_dc()
Michael Niedermayer [Tue, 6 May 2014 03:36:10 +0000 (05:36 +0200)]
avcodec/mpeg4videoenc: fix alternative implementation of mpeg4_encode_dc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg4videodec: fix mcbpc error messages
Michael Niedermayer [Tue, 6 May 2014 03:34:00 +0000 (05:34 +0200)]
avcodec/mpeg4videodec: fix mcbpc error messages

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snowenc: Fix "incompatible pointer type" warning
Michael Niedermayer [Mon, 5 May 2014 23:03:58 +0000 (01:03 +0200)]
avcodec/snowenc: Fix "incompatible pointer type" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/af_bs2b: Fix incompatible pointer type warnings
Michael Niedermayer [Mon, 5 May 2014 23:01:02 +0000 (01:01 +0200)]
avfilter/af_bs2b: Fix incompatible pointer type warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/svq3: Fix "incompatible pointer type" warnings
Michael Niedermayer [Mon, 5 May 2014 21:30:35 +0000 (23:30 +0200)]
avcodec/svq3: Fix "incompatible pointer type" warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/segment: Use av_malloc_array()
Michael Niedermayer [Mon, 5 May 2014 21:11:04 +0000 (23:11 +0200)]
avformat/segment: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegts: always reset pes packet state on new packet
Marton Balint [Fri, 2 May 2014 15:17:01 +0000 (17:17 +0200)]
mpegts: always reset pes packet state on new packet

Fixes ticket #3584.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agompegts: unref buffer in reset_pes_packet_state
Marton Balint [Fri, 2 May 2014 15:13:27 +0000 (17:13 +0200)]
mpegts: unref buffer in reset_pes_packet_state

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agompegts: factorize pes packet state reset function
Marton Balint [Fri, 2 May 2014 14:51:58 +0000 (16:51 +0200)]
mpegts: factorize pes packet state reset function

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agompegts: fix indentation after last commit
Marton Balint [Thu, 1 May 2014 23:44:58 +0000 (01:44 +0200)]
mpegts: fix indentation after last commit

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agompegts: only emit new packets if data buffer exists
Marton Balint [Thu, 1 May 2014 23:44:19 +0000 (01:44 +0200)]
mpegts: only emit new packets if data buffer exists

I don't think this can acutally happen in the current code, but better safe
than sorry.

Fixes Coverity CID 732217.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agompegts: remove uneeded buf_size check
Marton Balint [Thu, 1 May 2014 23:35:28 +0000 (01:35 +0200)]
mpegts: remove uneeded buf_size check

It is already ensured by the loop condition

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoavutil/file_open: Use av_mallocz_array()
Michael Niedermayer [Mon, 5 May 2014 17:00:38 +0000 (19:00 +0200)]
avutil/file_open: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotests/tiny_ssim: more correct error message
Michael Niedermayer [Mon, 5 May 2014 17:00:14 +0000 (19:00 +0200)]
tests/tiny_ssim: more correct error message

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/audio_fifo: Use av_mallocz_array()
Michael Niedermayer [Mon, 5 May 2014 16:59:56 +0000 (18:59 +0200)]
avutil/audio_fifo: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotools/ismindex: use av_mallocz_array()
Michael Niedermayer [Mon, 5 May 2014 16:40:55 +0000 (18:40 +0200)]
tools/ismindex: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotests/tiny_ssim: check dimensions
Michael Niedermayer [Mon, 5 May 2014 16:39:30 +0000 (18:39 +0200)]
tests/tiny_ssim: check dimensions

Fix integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/fifo: add const to arguments
Lukasz Marek [Sun, 4 May 2014 20:03:46 +0000 (22:03 +0200)]
lavu/fifo: add const to arguments

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/astenc: avoid using AVCodecContext.frame_number
Michael Niedermayer [Mon, 5 May 2014 14:46:47 +0000 (16:46 +0200)]
avformat/astenc: avoid using AVCodecContext.frame_number

Theres no gurantee that the user application has initialized it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3828eb8519c1530392ab8820b1aa784602128afc'
Michael Niedermayer [Mon, 5 May 2014 14:13:29 +0000 (16:13 +0200)]
Merge commit '3828eb8519c1530392ab8820b1aa784602128afc'

* commit '3828eb8519c1530392ab8820b1aa784602128afc':
  libfdk-aac: Relicense the library wrappers to 2-clause BSD

Conflicts:
libavcodec/libfdk-aacdec.c
libavcodec/libfdk-aacenc.c

<Daemon404> michaelni, fyi, for the fdk relicensing, wbs also contact all the ffmpeg-only contributers
<Daemon404> so it should be fine to merge.

Thanks-to: Martin Storsjö <martin@martin.st>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '15fa856b82ea7dbbf69edc1074eb13dd00b0fa84'
Michael Niedermayer [Mon, 5 May 2014 13:56:45 +0000 (15:56 +0200)]
Merge commit '15fa856b82ea7dbbf69edc1074eb13dd00b0fa84'

* commit '15fa856b82ea7dbbf69edc1074eb13dd00b0fa84':
  libfdk-aacenc: Enable 7.1 channel encoding

See: 91489d28ba271fb9dde54cb26e7ae93ada2997df, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9580818c5d934bde65a95efd2cee61c174721092'
Michael Niedermayer [Mon, 5 May 2014 13:42:26 +0000 (15:42 +0200)]
Merge commit '9580818c5d934bde65a95efd2cee61c174721092'

* commit '9580818c5d934bde65a95efd2cee61c174721092':
  avconv: rename OutputStream.opts to OutputStream.encoder_opts

Conflicts:
ffmpeg.c
ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11'
Michael Niedermayer [Mon, 5 May 2014 13:09:46 +0000 (15:09 +0200)]
Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11'

* commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11':
  avconv: remove a useless line

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d'
Michael Niedermayer [Mon, 5 May 2014 13:03:52 +0000 (15:03 +0200)]
Merge commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d'

* commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d':
  avconv: rename 'codec' to 'enc_ctx'

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '650a5206a944fd36a42d92f98e745972056b1f7c'
Michael Niedermayer [Mon, 5 May 2014 12:55:26 +0000 (14:55 +0200)]
Merge commit '650a5206a944fd36a42d92f98e745972056b1f7c'

* commit '650a5206a944fd36a42d92f98e745972056b1f7c':
  avconv: rename 'icodec' to 'dec_ctx'

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'
Michael Niedermayer [Mon, 5 May 2014 12:44:33 +0000 (14:44 +0200)]
Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'

* commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66':
  avconv: rename InputStream.opts to InputStream.decoder_opts

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3'
Michael Niedermayer [Mon, 5 May 2014 12:39:13 +0000 (14:39 +0200)]
Merge commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3'

* commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3':
  avconv: simplify exit_program() by using more local vars

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibfdk-aac: Relicense the library wrappers to 2-clause BSD
Martin Storsjö [Wed, 30 Apr 2014 06:44:31 +0000 (09:44 +0300)]
libfdk-aac: Relicense the library wrappers to 2-clause BSD

This should make it possible for Fraunhofer to contribute to these
wrappers - they didn't want to contribute to code under LGPL2.1 with
the "or any later version" clause (which allowed using the code
under the LGPL3 license).

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolibfdk-aacenc: Enable 7.1 channel encoding
Jean First [Sun, 26 Jan 2014 00:31:53 +0000 (01:31 +0100)]
libfdk-aacenc: Enable 7.1 channel encoding

7.1(wide) and 7.1(wide-side) channel layouts are supported in
fdk-aac since the 0.1.3 release.

The earlier versions of fdk-aac didn't include any library
version defines in the public headers, thus checking for
the AACENCODER_LIB_VL0 define is enough to know that we're
building against a new enough version of fdk-aac.

This change includes contributions by Tim Walker,
Michael Niedermayer and Timothy Gu.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoFix standalone compilation of sonic lossless encoder.
Carl Eugen Hoyos [Mon, 5 May 2014 07:14:31 +0000 (09:14 +0200)]
Fix standalone compilation of sonic lossless encoder.

6 years agoavfilter/f_select: fix incompatible pointer type warning
Michael Niedermayer [Mon, 5 May 2014 03:51:50 +0000 (05:51 +0200)]
avfilter/f_select: fix incompatible pointer type warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/lossless_videodsp: fix incompatible pointer type warning
Michael Niedermayer [Mon, 5 May 2014 03:48:34 +0000 (05:48 +0200)]
avcodec/lossless_videodsp: fix incompatible pointer type warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavisynth: set duration of audio streams
Hendrik Leppkes [Sun, 4 May 2014 10:55:58 +0000 (12:55 +0200)]
avisynth: set duration of audio streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale/utils: use FF_ALLOC(Z)_ARRAY_OR_GOTO() and av_malloc(z)_array()
Michael Niedermayer [Sun, 4 May 2014 17:49:06 +0000 (19:49 +0200)]
swscale/utils: use FF_ALLOC(Z)_ARRAY_OR_GOTO() and av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/pca: Use av_malloc_array()
Michael Niedermayer [Sun, 4 May 2014 17:00:16 +0000 (19:00 +0200)]
avutil/pca: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTANERS: update snow/ffv1/nut entries as these are no longer in a single file
Michael Niedermayer [Sun, 4 May 2014 16:57:15 +0000 (18:57 +0200)]
MAINTANERS: update snow/ffv1/nut entries as these are no longer in a single file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sun, 4 May 2014 16:24:21 +0000 (18:24 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Map --enable-lto to -ipo when compiling with icc.
  Disable inline_asm_direct_symbol_refs if lto was requested.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMap --enable-lto to -ipo when compiling with icc.
Carl Eugen Hoyos [Sun, 4 May 2014 15:16:26 +0000 (17:16 +0200)]
Map --enable-lto to -ipo when compiling with icc.

6 years agoDisable inline_asm_direct_symbol_refs if lto was requested.
Carl Eugen Hoyos [Sun, 4 May 2014 15:09:21 +0000 (17:09 +0200)]
Disable inline_asm_direct_symbol_refs if lto was requested.

This fixes link time optimizations with gcc without disabling inline asm.

Fixes ticket #2941.

6 years agolavf/mux: pass options to nested structs of priv data
Lukasz Marek [Sun, 4 May 2014 05:11:50 +0000 (07:11 +0200)]
lavf/mux: pass options to nested structs of priv data

This is continuation of commit 330d547e
Nested struct is set in two places.
Previous commit set nested struct only in one case.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h263dec: use AV_EF_IGNORE_ERR
Michael Niedermayer [Fri, 2 May 2014 14:33:56 +0000 (16:33 +0200)]
avcodec/h263dec: use AV_EF_IGNORE_ERR

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: add AV_EF_IGNORE_ERR
Michael Niedermayer [Fri, 2 May 2014 14:37:28 +0000 (16:37 +0200)]
avformat: add AV_EF_IGNORE_ERR

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: add AV_EF_IGNORE_ERR
Michael Niedermayer [Fri, 2 May 2014 14:33:32 +0000 (16:33 +0200)]
avcodec: add AV_EF_IGNORE_ERR

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/codecs: document ignore_err
Michael Niedermayer [Fri, 2 May 2014 16:39:45 +0000 (18:39 +0200)]
doc/codecs: document ignore_err

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/lut3d: support 3DLUTSIZE directive for Davinci files.
Clément Bœsch [Sun, 4 May 2014 08:36:53 +0000 (10:36 +0200)]
avfilter/lut3d: support 3DLUTSIZE directive for Davinci files.

Fixes Ticket #2847.

6 years agoMAINTAINERS: add myself as lavd/xv maintainer
Lukasz Marek [Fri, 2 May 2014 22:16:02 +0000 (00:16 +0200)]
MAINTAINERS: add myself as lavd/xv maintainer

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMaintainers: add myself for msvc and icl.
Matt Oliver [Sat, 3 May 2014 07:55:24 +0000 (17:55 +1000)]
Maintainers: add myself for msvc and icl.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoEnable inline asm in intel compiler on windows.
Matt Oliver [Sat, 3 May 2014 09:37:53 +0000 (19:37 +1000)]
Enable inline asm in intel compiler on windows.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 3 May 2014 23:23:53 +0000 (01:23 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Initialize riff and wav size fields to -1 instead of 0.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510'
Michael Niedermayer [Sat, 3 May 2014 23:14:30 +0000 (01:14 +0200)]
Merge commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510'

* commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510':
  probe: Support AAC_LATM in set_codec_from_probe_data

Conflicts:
libavformat/utils.c

See: 7bdc5de33d21411e5e742670d669d9908d47a1cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5'
Michael Niedermayer [Sat, 3 May 2014 21:53:52 +0000 (23:53 +0200)]
Merge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5'

* commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5':
  latm: Add a probe function

Conflicts:
libavformat/rawdec.c

See: 47818b2a675cbb2a2fe0066c0657f3169047dd4d
See: 097f668047c8dd6308217c244075b1f97d496116
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f'
Michael Niedermayer [Sat, 3 May 2014 21:46:36 +0000 (23:46 +0200)]
Merge commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f'

* commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f':
  mathematics: K&R formatting cosmetics

Conflicts:
libavutil/mathematics.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3a177a9cca924e097265b32f9282814f6b653e08'
Michael Niedermayer [Sat, 3 May 2014 21:36:01 +0000 (23:36 +0200)]
Merge commit '3a177a9cca924e097265b32f9282814f6b653e08'

* commit '3a177a9cca924e097265b32f9282814f6b653e08':
  swscale: Fix an undefined behaviour

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '925c37874b617816b6f460c6f229c18b46548b46'
Michael Niedermayer [Sat, 3 May 2014 21:29:20 +0000 (23:29 +0200)]
Merge commit '925c37874b617816b6f460c6f229c18b46548b46'

* commit '925c37874b617816b6f460c6f229c18b46548b46':
  vp9: Read the frame size as unsigned

Conflicts:
libavcodec/vp9.c

See: c72f587353d9f88c7fbbbf6ef78b1d9ba3d38fd7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964'
Michael Niedermayer [Sat, 3 May 2014 21:21:21 +0000 (23:21 +0200)]
Merge commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964'

* commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964':
  aac: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c6b42e85493915a3c3891345f57422f9031a0b4f'
Michael Niedermayer [Sat, 3 May 2014 21:15:37 +0000 (23:15 +0200)]
Merge commit 'c6b42e85493915a3c3891345f57422f9031a0b4f'

* commit 'c6b42e85493915a3c3891345f57422f9031a0b4f':
  flv: K&R formatting cosmetics

Conflicts:
libavcodec/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/jpeglsdec: add cast to silence pointer type warning
Michael Niedermayer [Sat, 3 May 2014 20:54:01 +0000 (22:54 +0200)]
avcodec/jpeglsdec: add cast to silence pointer type warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_deshake: dont pass the wrong context into the SAD functions
Michael Niedermayer [Sat, 3 May 2014 20:52:17 +0000 (22:52 +0200)]
avfilter/vf_deshake: dont pass the wrong context into the SAD functions

This fixes pointer type warnings
The context should have been unused so this should not fix any real bug

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snow_dwt: fix "incompatible pointer type" warnings
Michael Niedermayer [Sat, 3 May 2014 20:49:21 +0000 (22:49 +0200)]
avcodec/snow_dwt: fix "incompatible pointer type" warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoInitialize riff and wav size fields to -1 instead of 0.
Carl Eugen Hoyos [Sat, 3 May 2014 18:18:13 +0000 (20:18 +0200)]
Initialize riff and wav size fields to -1 instead of 0.

WMP doess not play the output files if the fields are
set to 0 and not overwritten (using pipe output).

Fixes ticket #3346.

6 years agoavcodec/kgv1dec: add casts to silence "assignment from incompatible pointer type"
Michael Niedermayer [Sat, 3 May 2014 20:09:26 +0000 (22:09 +0200)]
avcodec/kgv1dec: add casts to silence "assignment from incompatible pointer type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/xbmdec: fix pointer type warnings
Michael Niedermayer [Sat, 3 May 2014 20:07:54 +0000 (22:07 +0200)]
avcodec/xbmdec: fix pointer type warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavconv: rename OutputStream.opts to OutputStream.encoder_opts
Anton Khirnov [Fri, 4 Apr 2014 17:38:04 +0000 (19:38 +0200)]
avconv: rename OutputStream.opts to OutputStream.encoder_opts

This makes it more clear what is this variable for exactly.

6 years agoavconv: remove a useless line
Anton Khirnov [Sun, 6 Apr 2014 05:28:51 +0000 (07:28 +0200)]
avconv: remove a useless line

Doing anything with that field when we are doing streamcopy (so the
encoder is not opened) should have absolutely no effect.

6 years agoavconv: rename 'codec' to 'enc_ctx'
Anton Khirnov [Fri, 4 Apr 2014 17:59:48 +0000 (19:59 +0200)]
avconv: rename 'codec' to 'enc_ctx'

This more clearly describes what is the variable used for.

Also, move its declaration into the block where it is actually used.

6 years agoavconv: rename 'icodec' to 'dec_ctx'
Anton Khirnov [Fri, 4 Apr 2014 17:59:48 +0000 (19:59 +0200)]
avconv: rename 'icodec' to 'dec_ctx'

This more clearly describes what is the variable used for.

6 years agoavconv: rename InputStream.opts to InputStream.decoder_opts
Anton Khirnov [Fri, 4 Apr 2014 17:38:04 +0000 (19:38 +0200)]
avconv: rename InputStream.opts to InputStream.decoder_opts

This makes it more clear what is this variable for exactly.

6 years agoavconv: simplify exit_program() by using more local vars
Anton Khirnov [Tue, 25 Mar 2014 11:38:31 +0000 (12:38 +0100)]
avconv: simplify exit_program() by using more local vars

6 years agoavcodec/h263dec: fix "incompatible pointer type" warning
Michael Niedermayer [Sat, 3 May 2014 18:23:12 +0000 (20:23 +0200)]
avcodec/h263dec: fix "incompatible pointer type" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/audio: use av_mallocz_array()
Michael Niedermayer [Sat, 3 May 2014 17:23:44 +0000 (19:23 +0200)]
avfilter/audio: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcdoec/snowenc: use av_mallocz_array()
Michael Niedermayer [Sat, 3 May 2014 17:22:37 +0000 (19:22 +0200)]
avcdoec/snowenc: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ffv1dec: use av_malloc_array()
Michael Niedermayer [Sat, 3 May 2014 17:18:22 +0000 (19:18 +0200)]
avcodec/ffv1dec: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/edgedetect: update copyright.
Clément Bœsch [Sat, 3 May 2014 17:10:28 +0000 (19:10 +0200)]
avfilter/edgedetect: update copyright.

6 years agoavfilter/edgedetect: reindent after previous commit.
Clément Bœsch [Sat, 3 May 2014 16:46:16 +0000 (18:46 +0200)]
avfilter/edgedetect: reindent after previous commit.

6 years agoavfilter/edgedetect: add a colormix mode.
Clément Bœsch [Sat, 3 May 2014 15:41:32 +0000 (17:41 +0200)]
avfilter/edgedetect: add a colormix mode.

6 years agoprobe: Support AAC_LATM in set_codec_from_probe_data
Luca Barbato [Sat, 26 Apr 2014 19:10:30 +0000 (21:10 +0200)]
probe: Support AAC_LATM in set_codec_from_probe_data

6 years agolatm: Add a probe function
Luca Barbato [Sat, 26 Apr 2014 18:32:47 +0000 (20:32 +0200)]
latm: Add a probe function

6 years agomathematics: K&R formatting cosmetics
Luca Barbato [Thu, 1 May 2014 12:54:06 +0000 (14:54 +0200)]
mathematics: K&R formatting cosmetics

6 years agoswscale: Fix an undefined behaviour
Luca Barbato [Thu, 1 May 2014 22:21:23 +0000 (00:21 +0200)]
swscale: Fix an undefined behaviour

Prevent a division by zero down the codepath.

Sample-Id: 00001721-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agovp9: Read the frame size as unsigned
Luca Barbato [Thu, 1 May 2014 22:18:04 +0000 (00:18 +0200)]
vp9: Read the frame size as unsigned

Sample-Id: 00001723-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agoavfilter/edgedetect: make processing functions context free.
Clément Bœsch [Sat, 3 May 2014 12:57:51 +0000 (14:57 +0200)]
avfilter/edgedetect: make processing functions context free.

6 years agox86/cavdsp: prevent named constraints appearing twice.
Matt Oliver [Sat, 3 May 2014 07:59:20 +0000 (17:59 +1000)]
x86/cavdsp: prevent named constraints appearing twice.

6 years agoRemove two duplicated named asm constraints.
Carl Eugen Hoyos [Sat, 3 May 2014 06:25:05 +0000 (06:25 +0000)]
Remove two duplicated named asm constraints.

This fixes compilation of libmpcodecs/vf_fspp.c with gcc and
INLINE_ASM_DIRECT_SYMBOL_REFS disabled.

6 years agovfilter/vf_yadif: fix request_frame after 0f9f24c9
Michael Niedermayer [Sat, 3 May 2014 14:07:50 +0000 (16:07 +0200)]
vfilter/vf_yadif: fix request_frame after 0f9f24c9

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264: mark recovery_cnt==0 frames as keyframes
Michael Niedermayer [Sun, 3 Nov 2013 16:24:05 +0000 (17:24 +0100)]
avcodec/h264: mark recovery_cnt==0 frames as keyframes

Fixes Ticket3063

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix standalone compilation of dsd planar decoders.
Carl Eugen Hoyos [Sat, 3 May 2014 06:53:57 +0000 (08:53 +0200)]
Fix standalone compilation of dsd planar decoders.

6 years agoFix oga muxer standalone compilation.
Carl Eugen Hoyos [Sat, 3 May 2014 06:51:27 +0000 (08:51 +0200)]
Fix oga muxer standalone compilation.