ffmpeg.git
5 years agoavfilter/phase: add some constness for RO data pointers.
Clément Bœsch [Sat, 3 May 2014 20:52:28 +0000 (22:52 +0200)]
avfilter/phase: add some constness for RO data pointers.

5 years agoavfilter/phase: add timeline support.
Clément Bœsch [Sat, 3 May 2014 20:43:20 +0000 (22:43 +0200)]
avfilter/phase: add timeline support.

5 years agoavfilter/phase: avoid a memcpy per frame.
Clément Bœsch [Sat, 3 May 2014 20:42:54 +0000 (22:42 +0200)]
avfilter/phase: avoid a memcpy per frame.

5 years agoavfilter/phase: do not pass the whole context to analyze_plane().
Clément Bœsch [Sat, 3 May 2014 20:41:33 +0000 (22:41 +0200)]
avfilter/phase: do not pass the whole context to analyze_plane().

Also make sure the AVFilterContext is only being used for logging by
changing the type to void*

5 years agoavfilter/phase: add comment on the context cached frame.
Clément Bœsch [Sat, 3 May 2014 20:39:31 +0000 (22:39 +0200)]
avfilter/phase: add comment on the context cached frame.

5 years agoMerge commit '0bacfa8d37710b904897e7cbeb8d6f96fbf75e2e'
Michael Niedermayer [Thu, 8 May 2014 19:54:07 +0000 (21:54 +0200)]
Merge commit '0bacfa8d37710b904897e7cbeb8d6f96fbf75e2e'

* commit '0bacfa8d37710b904897e7cbeb8d6f96fbf75e2e':
  rtmpproto: Check the buffer sizes when copying app/playpath strings

Conflicts:
libavformat/rtmpproto.c

See: 0c2a6dabced53b4df57aedf47f0c1b8233035fed
See: 02ac3398eb52679301028c2fd3ebad1b6261b4da
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/exr: mark gama option as experimental / unsupported
Michael Niedermayer [Thu, 8 May 2014 19:10:53 +0000 (21:10 +0200)]
avcodec/exr: mark gama option as experimental / unsupported

Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/exr: Add a gamma flag to exr loader to avoid banding
Gonzalo Garramuno [Thu, 8 May 2014 16:27:56 +0000 (13:27 -0300)]
avcodec/exr: Add a gamma flag to exr loader to avoid banding

This is needed to avoid banding artifacts when gammaing the picture.
Currently, if done with a video filter, the process is done on uints
instead of full float.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rtmpproto: add FFMIN() to av_strlcpy()
Michael Niedermayer [Thu, 8 May 2014 16:19:38 +0000 (18:19 +0200)]
avformat/rtmpproto: add FFMIN() to av_strlcpy()

Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agortmpproto: Check the buffer sizes when copying app/playpath strings
Martin Storsjö [Thu, 8 May 2014 12:12:23 +0000 (15:12 +0300)]
rtmpproto: Check the buffer sizes when copying app/playpath strings

As pointed out by Reimar Döffinger.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec/mjpegdec: zero gb to silence warning about it being possibly uninitialized
Michael Niedermayer [Thu, 8 May 2014 15:36:50 +0000 (17:36 +0200)]
avcodec/mjpegdec: zero gb to silence warning about it being possibly uninitialized

The code is not speed relevant, also its more robust if the pointers are NULL instead of random.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/takdec: Always initialize hsize, silence "may be used uninitialized" warning
Michael Niedermayer [Thu, 8 May 2014 15:33:28 +0000 (17:33 +0200)]
avcodec/takdec: Always initialize hsize, silence "may be used uninitialized" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dcadec: add an assert to silence a uninitialized variable warning
Michael Niedermayer [Thu, 8 May 2014 14:48:41 +0000 (16:48 +0200)]
avcodec/dcadec: add an assert to silence a uninitialized variable warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dcadec: remove always true if()
Michael Niedermayer [Thu, 8 May 2014 14:47:20 +0000 (16:47 +0200)]
avcodec/dcadec: remove always true if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/cinepakenc: Fix "may be used uninitialized in this function" warnings
Michael Niedermayer [Thu, 8 May 2014 13:53:40 +0000 (15:53 +0200)]
avcodec/cinepakenc: Fix "may be used uninitialized in this function" warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_compand: Silence "may be used uninitialized" warning
Michael Niedermayer [Thu, 8 May 2014 04:53:16 +0000 (06:53 +0200)]
avfilter/af_compand: Silence "may be used uninitialized" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Thu, 8 May 2014 01:49:04 +0000 (03:49 +0200)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavc: use av_fifo_freep
  lavf: use av_fifo_freep
  ffmpeg: use av_fifo_freep
  lavd/jack_audio: use av_fifo_freep
  lavfi: use av_fifo_freep
  lavu/fifo: add av_fifo_freep function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc: use av_fifo_freep
Lukasz Marek [Tue, 6 May 2014 19:51:14 +0000 (21:51 +0200)]
lavc: use av_fifo_freep

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavf: use av_fifo_freep
Lukasz Marek [Tue, 6 May 2014 19:48:14 +0000 (21:48 +0200)]
lavf: use av_fifo_freep

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoffmpeg: use av_fifo_freep
Lukasz Marek [Tue, 6 May 2014 19:43:34 +0000 (21:43 +0200)]
ffmpeg: use av_fifo_freep

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/jack_audio: use av_fifo_freep
Lukasz Marek [Tue, 6 May 2014 19:38:34 +0000 (21:38 +0200)]
lavd/jack_audio: use av_fifo_freep

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavfi: use av_fifo_freep
Lukasz Marek [Tue, 6 May 2014 19:31:08 +0000 (21:31 +0200)]
lavfi: use av_fifo_freep

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavu/fifo: add av_fifo_freep function
Lukasz Marek [Tue, 6 May 2014 19:28:51 +0000 (21:28 +0200)]
lavu/fifo: add av_fifo_freep function

Function allows to free fifo and reset freed pointer.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoavcodec/huffyuvenc: Make version 3 of ffvhuff non experimental
Michael Niedermayer [Tue, 29 Apr 2014 15:27:53 +0000 (17:27 +0200)]
avcodec/huffyuvenc: Make version 3 of ffvhuff non experimental

Tested-by: Tim Nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/cinepakenc: drop coded_frame init
Michael Niedermayer [Wed, 7 May 2014 15:54:48 +0000 (17:54 +0200)]
avcodec/cinepakenc: drop coded_frame init

Fixes const being lost warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/cinepakenc: Zero AVPictures, silence "may be used uninitialized" warnings
Michael Niedermayer [Wed, 7 May 2014 15:53:04 +0000 (17:53 +0200)]
avcodec/cinepakenc: Zero AVPictures, silence "may be used uninitialized" warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/eamad: silence uninitialized variable warnings
Michael Niedermayer [Wed, 7 May 2014 15:48:04 +0000 (17:48 +0200)]
avcodec/eamad: silence uninitialized variable warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ac3enc: silence 2 warnings about "possibly uninitialized" variables
Michael Niedermayer [Wed, 7 May 2014 14:52:36 +0000 (16:52 +0200)]
avcodec/ac3enc: silence 2 warnings about "possibly uninitialized" variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/aeval: silence "may be used uninitialized" warning
Michael Niedermayer [Wed, 7 May 2014 14:14:44 +0000 (16:14 +0200)]
avfilter/aeval: silence "may be used uninitialized" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoinline asm: fix arrays as named constraints.
Matt Oliver [Wed, 7 May 2014 04:16:26 +0000 (14:16 +1000)]
inline asm: fix arrays as named constraints.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: fix const warnings
Michael Niedermayer [Wed, 7 May 2014 03:52:58 +0000 (05:52 +0200)]
avformat/utils: fix const warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocmdutils: include config.h, fix "is not defined" warning due to CONFIG_OPENCL
Michael Niedermayer [Wed, 7 May 2014 03:38:23 +0000 (05:38 +0200)]
cmdutils: include config.h, fix "is not defined" warning due to CONFIG_OPENCL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/h263dec/h263_probe: Check TR
Michael Niedermayer [Wed, 7 May 2014 01:41:41 +0000 (03:41 +0200)]
avformat/h263dec/h263_probe: Check TR

Fixes missdetection of Misdetection_345.mp3
Fixes missdetection of Misdetection_421.mp3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/h263dec/h263_probe: Check PSC bit 9 and 13 in
Michael Niedermayer [Wed, 7 May 2014 01:20:13 +0000 (03:20 +0200)]
avformat/h263dec/h263_probe: Check PSC bit 9 and 13 in

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/h263dec: shift data in state to make more bits available to probe
Michael Niedermayer [Wed, 7 May 2014 01:12:34 +0000 (03:12 +0200)]
avformat/h263dec: shift data in state to make more bits available to probe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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.

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

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

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

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