ffmpeg.git
5 years agoavfilter/vf_fspp: add missing inline asm guards
James Almer [Wed, 24 Dec 2014 18:44:06 +0000 (15:44 -0300)]
avfilter/vf_fspp: add missing inline asm guards

5 years agolavfi/mp: drop mp=fspp filter
Stefano Sabatini [Wed, 24 Dec 2014 15:19:29 +0000 (16:19 +0100)]
lavfi/mp: drop mp=fspp filter

It has been ported to libavfilter.

5 years agolavfi: port mp=fspp to a native libavfilter filter
Arwa Arif [Tue, 23 Dec 2014 16:54:37 +0000 (22:24 +0530)]
lavfi: port mp=fspp to a native libavfilter filter

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agoavfilter/showwaves: fix height range for cline mode
Clément Bœsch [Wed, 24 Dec 2014 14:11:44 +0000 (15:11 +0100)]
avfilter/showwaves: fix height range for cline mode

5 years agoavfilter/showwaves: use INT16_MAX instead of a self defined macro
Clément Bœsch [Wed, 24 Dec 2014 14:11:23 +0000 (15:11 +0100)]
avfilter/showwaves: use INT16_MAX instead of a self defined macro

5 years agoavformat/seek: move the cur variable into the loop
Michael Niedermayer [Wed, 24 Dec 2014 12:01:31 +0000 (13:01 +0100)]
avformat/seek: move the cur variable into the loop

This improves readability and makes it clear that the freed
value is not used after the end of an iteration

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rtpdec_mpeg4: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Wed, 24 Dec 2014 12:01:10 +0000 (13:01 +0100)]
avformat/rtpdec_mpeg4: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rtpproto: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Wed, 24 Dec 2014 12:00:34 +0000 (13:00 +0100)]
avformat/rtpproto: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/seek: use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Wed, 24 Dec 2014 12:00:03 +0000 (13:00 +0100)]
avformat/seek: use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotableprint_vlc.h: Should not be checked by checkheaders.
Reimar Döffinger [Wed, 24 Dec 2014 11:56:00 +0000 (12:56 +0100)]
tableprint_vlc.h: Should not be checked by checkheaders.

Same as for tableprint.h.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoswscale/yuv2rgb: Fix width % 4 != 0 with bgr4_byte/rgb4_byte
Michael Niedermayer [Tue, 23 Dec 2014 23:33:21 +0000 (00:33 +0100)]
swscale/yuv2rgb: Fix width % 4 != 0 with bgr4_byte/rgb4_byte

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/yuv2rgb: Fix width % 4 != 0 with bgr4/rgb4
Michael Niedermayer [Tue, 23 Dec 2014 23:32:53 +0000 (00:32 +0100)]
swscale/yuv2rgb: Fix width % 4 != 0 with bgr4/rgb4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/yuv2rgb: fix width % 8 != 0 and rgb/bgr8 output
Michael Niedermayer [Tue, 23 Dec 2014 23:10:49 +0000 (00:10 +0100)]
swscale/yuv2rgb: fix width % 8 != 0 and rgb/bgr8 output

Fixes Ticket2570

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_uspp: use av_malloc_array()
Michael Niedermayer [Tue, 23 Dec 2014 21:52:56 +0000 (22:52 +0100)]
avfilter/vf_uspp: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/aea: reduce false positives in probing
Michael Niedermayer [Tue, 23 Dec 2014 17:41:53 +0000 (18:41 +0100)]
avformat/aea: reduce false positives in probing

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/avidec: optimize probe
Michael Niedermayer [Tue, 23 Dec 2014 15:32:26 +0000 (16:32 +0100)]
avformat/avidec: optimize probe

about 2x as fast

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rtpdec: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Tue, 23 Dec 2014 14:35:07 +0000 (15:35 +0100)]
avformat/rtpdec: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rtpdec_latm: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Tue, 23 Dec 2014 14:34:29 +0000 (15:34 +0100)]
avformat/rtpdec_latm: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rtpdec_xiph: use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Tue, 23 Dec 2014 14:33:07 +0000 (15:33 +0100)]
avformat/rtpdec_xiph: use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/faq: explain pkg-config basic setup.
Nicolas George [Tue, 23 Dec 2014 09:34:48 +0000 (10:34 +0100)]
doc/faq: explain pkg-config basic setup.

5 years agox86/vp9: remove duplicate function prototypes
James Almer [Tue, 23 Dec 2014 03:51:26 +0000 (00:51 -0300)]
x86/vp9: remove duplicate function prototypes

Fixes "redundant redeclaration" warnings.

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agotools/probetest: support testing a single specified input format
Michael Niedermayer [Sun, 21 Dec 2014 19:20:29 +0000 (20:20 +0100)]
tools/probetest: support testing a single specified input format

This reduces the time the test takes significantly when only one
formats needs to be tested

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoframe_thread_encoder: use ref-counting to avoid memcpy of all input frames
Hendrik Leppkes [Mon, 22 Dec 2014 23:42:49 +0000 (00:42 +0100)]
frame_thread_encoder: use ref-counting to avoid memcpy of all input frames

Apparently uneeded lock/unlock removed by commiter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: also show frames with missing fields when CODEC_FLAG2_SHOW_ALL is set
Michael Niedermayer [Mon, 22 Dec 2014 20:17:49 +0000 (21:17 +0100)]
avcodec/h264: also show frames with missing fields when CODEC_FLAG2_SHOW_ALL is set

This allows viewing more of ticket2254

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocdxl: fix duration
Piotr Bandurski [Mon, 17 Dec 2012 11:55:34 +0000 (12:55 +0100)]
cdxl: fix duration

fixes ticket #1937

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rtmpproto: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Mon, 22 Dec 2014 10:52:22 +0000 (11:52 +0100)]
avformat/rtmpproto: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/riffdec: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Mon, 22 Dec 2014 10:51:55 +0000 (11:51 +0100)]
avformat/riffdec: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/os_support: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Mon, 22 Dec 2014 10:49:35 +0000 (11:49 +0100)]
avformat/os_support: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: check w/h in dpx_probe
Michael Niedermayer [Sun, 21 Dec 2014 22:00:36 +0000 (23:00 +0100)]
avformat/img2dec: check w/h in dpx_probe

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/swfdec: Check frame size rectangle in probe()
Michael Niedermayer [Sun, 21 Dec 2014 19:50:59 +0000 (20:50 +0100)]
avformat/swfdec: Check frame size rectangle in probe()

fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegtsenc: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Sun, 21 Dec 2014 18:24:32 +0000 (19:24 +0100)]
avformat/mpegtsenc: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegenc: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Sun, 21 Dec 2014 18:24:11 +0000 (19:24 +0100)]
avformat/mpegenc: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_boxblur: Support 10bit planar formats
Michael Niedermayer [Sun, 21 Dec 2014 13:59:05 +0000 (14:59 +0100)]
avfilter/vf_boxblur: Support 10bit planar formats

5 years agoavfilter/vf_boxblur: add gbrp pixfmt
Michael Niedermayer [Sun, 21 Dec 2014 02:12:02 +0000 (03:12 +0100)]
avfilter/vf_boxblur: add gbrp pixfmt

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_spp: Fix overflow in 8bit store slice
Michael Niedermayer [Sun, 21 Dec 2014 00:45:55 +0000 (01:45 +0100)]
avfilter/vf_spp: Fix overflow in 8bit store slice

Fixes regression with
ffplay -f lavfi -i testsrc=640x480  -vf format=gray,boxblur=20:10,geq="'mod(lum(X,Y),16)*15'",boxblur=10,geq="'abs(mod(lum(X,Y),15)-7)*32'",spp=4:40

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_boxblur: avoid one addition per line
Michael Niedermayer [Sat, 20 Dec 2014 23:59:23 +0000 (00:59 +0100)]
avfilter/vf_boxblur: avoid one addition per line

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_boxblur: factor rounder offset out
Michael Niedermayer [Sat, 20 Dec 2014 23:54:36 +0000 (00:54 +0100)]
avfilter/vf_boxblur: factor rounder offset out

3322 -> 3204 cycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_spp: fix overflows with depth > 8
Michael Niedermayer [Sat, 20 Dec 2014 19:39:13 +0000 (20:39 +0100)]
avfilter/vf_spp: fix overflows with depth > 8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0'
Michael Niedermayer [Sat, 20 Dec 2014 18:08:39 +0000 (19:08 +0100)]
Merge commit '9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0'

* commit '9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0':
  mpegts: add support for Opus

Conflicts:
libavcodec/opus_parser.c
libavformat/mpegts.c

See: 74141f693ded2fbf75af56fff309d2db35183635
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_spp: add support for 9bit YUV and GBR as well as GBRP10
Michael Niedermayer [Sat, 20 Dec 2014 17:33:52 +0000 (18:33 +0100)]
avfilter/vf_spp: add support for 9bit YUV and GBR as well as GBRP10

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/idctdsp: use the 10bit code for 9 bit too
Michael Niedermayer [Sat, 20 Dec 2014 17:32:50 +0000 (18:32 +0100)]
avcodec/idctdsp: use the 10bit code for 9 bit too

9bit is currently not used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/fdctdsp: use the 10bit code for 9 bit too
Michael Niedermayer [Sat, 20 Dec 2014 17:32:50 +0000 (18:32 +0100)]
avcodec/fdctdsp: use the 10bit code for 9 bit too

9bit is currently not used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mmst: Use av_freep() avoid leaving stale pointers in memory
Michael Niedermayer [Sat, 20 Dec 2014 15:54:25 +0000 (16:54 +0100)]
avformat/mmst: Use av_freep() avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/http: Use av_freep() avoid leaving stale pointers in memory
Michael Niedermayer [Sat, 20 Dec 2014 15:53:37 +0000 (16:53 +0100)]
avformat/http: Use av_freep() avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/id3v2: Use av_freep() avoid leaving stale pointers in memory
Michael Niedermayer [Sat, 20 Dec 2014 15:53:14 +0000 (16:53 +0100)]
avformat/id3v2: Use av_freep() avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/vp3dsp: port put_vp_no_rnd_pixels8_l2_mmx to yasm
James Almer [Sat, 20 Dec 2014 06:18:57 +0000 (03:18 -0300)]
x86/vp3dsp: port put_vp_no_rnd_pixels8_l2_mmx to yasm

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegts: add support for Opus
Kieran Kunhya [Fri, 17 Oct 2014 23:25:16 +0000 (00:25 +0100)]
mpegts: add support for Opus

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoMakefile: add dependencies which require ffversion.h
Michael Niedermayer [Sat, 20 Dec 2014 03:09:01 +0000 (04:09 +0100)]
Makefile: add dependencies which require ffversion.h

Without this ffversion.h could sometimes be built too late

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/westwood_aud: replace != 0 error check by <0
Michael Niedermayer [Sat, 20 Dec 2014 00:51:16 +0000 (01:51 +0100)]
avformat/westwood_aud: replace != 0 error check by <0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/asfenc: replace != 0 error check by <0
Michael Niedermayer [Sat, 20 Dec 2014 00:48:26 +0000 (01:48 +0100)]
avformat/asfenc: replace != 0 error check by <0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8ebf02f8f530240edf7e45f35f7647ef9dd44a58'
Michael Niedermayer [Fri, 19 Dec 2014 23:49:12 +0000 (00:49 +0100)]
Merge commit '8ebf02f8f530240edf7e45f35f7647ef9dd44a58'

* commit '8ebf02f8f530240edf7e45f35f7647ef9dd44a58':
  libavformat: Only use MoveFileExA when targeting the desktop API subset

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fc308b30bb24e623fed042ec78b10803b2362a18'
Michael Niedermayer [Fri, 19 Dec 2014 23:41:45 +0000 (00:41 +0100)]
Merge commit 'fc308b30bb24e623fed042ec78b10803b2362a18'

* commit 'fc308b30bb24e623fed042ec78b10803b2362a18':
  rtpenc_mpegts: Call write_trailer for the mpegts muxer even if no output buffer exists

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa'
Michael Niedermayer [Fri, 19 Dec 2014 23:33:08 +0000 (00:33 +0100)]
Merge commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa'

* commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa':
  mpegts: Support running the write_trailer function without an AVIOContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4895aa65c6ddec2e33ec3c023f221b1bafcbaf9f'
Michael Niedermayer [Fri, 19 Dec 2014 23:16:13 +0000 (00:16 +0100)]
Merge commit '4895aa65c6ddec2e33ec3c023f221b1bafcbaf9f'

* commit '4895aa65c6ddec2e33ec3c023f221b1bafcbaf9f':
  libavformat: Allow calling av_write_trailer with a NULL AVIOContext

Conflicts:
libavformat/mux.c

See: 277f20c3c877a74aca9d480480024a6d66c9fbc4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rsd: make tag_buf string larger
Clément Bœsch [Fri, 19 Dec 2014 23:17:43 +0000 (00:17 +0100)]
avformat/rsd: make tag_buf string larger

av_get_codec_tag_string() uses more that 1 char for unprintable characters.

5 years agoavformat/apngdec: make tag_buf string larger
Clément Bœsch [Fri, 19 Dec 2014 23:17:21 +0000 (00:17 +0100)]
avformat/apngdec: make tag_buf string larger

av_get_codec_tag_string() uses more that 1 char for unprintable characters.

5 years agoavformat/wavdec: make start_code string larger
Clément Bœsch [Fri, 19 Dec 2014 22:57:39 +0000 (23:57 +0100)]
avformat/wavdec: make start_code string larger

av_get_codec_tag_string() uses more that 1 char for unprintable characters.

5 years agowavdec: avoid output of arbitrary chars
Thomas Volkert [Fri, 19 Dec 2014 22:39:01 +0000 (23:39 +0100)]
wavdec: avoid output of arbitrary chars

use av_get_codec_tag_string() in wav_read_header() for printing the
faulty start code from riff header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agowavdec: refactor wav_read_header()
Thomas Volkert [Fri, 19 Dec 2014 20:57:05 +0000 (21:57 +0100)]
wavdec: refactor wav_read_header()

Make it more readable and display an error message in case an invalid
header is detected (the current version just returns
AVERROR_INVALIDDATA)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavformat: Only use MoveFileExA when targeting the desktop API subset
Martin Storsjö [Mon, 15 Dec 2014 21:55:30 +0000 (23:55 +0200)]
libavformat: Only use MoveFileExA when targeting the desktop API subset

The MoveFileExA is available in the headers regardless which API
subset is targeted, but it is missing in the Windows Phone link
libraries. When targeting Windows Store apps, the function is
available both in the headers and in the link libraries, and thus
there is no indication for the build system that this function
should be avoided - such an indication is only given by the
Windows App Certification Kit, which forbids using the MoveFileExA
function.

Therefore check the WINAPI_FAMILY defines instead, to figure out
which API subset is targeted.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agortpenc_mpegts: Call write_trailer for the mpegts muxer even if no output buffer exists
Martin Storsjö [Fri, 19 Dec 2014 13:26:23 +0000 (15:26 +0200)]
rtpenc_mpegts: Call write_trailer for the mpegts muxer even if no output buffer exists

Since the mpegts muxer now can handle being called with a NULL
AVIOContext, we don't need to try to allocate one before calling
write_trailer.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agompegts: Support running the write_trailer function without an AVIOContext
Martin Storsjö [Fri, 19 Dec 2014 13:23:06 +0000 (15:23 +0200)]
mpegts: Support running the write_trailer function without an AVIOContext

If opening and closing dynamic buffers as AVIOContext, we may
not have any AVIOContext available when wanting to close and
deallocate the muxer. Allow calling write_trailer despite this.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolibavformat: Allow calling av_write_trailer with a NULL AVIOContext
Martin Storsjö [Fri, 19 Dec 2014 13:40:02 +0000 (15:40 +0200)]
libavformat: Allow calling av_write_trailer with a NULL AVIOContext

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec/vp3: Fix offset handling
Michael Niedermayer [Fri, 19 Dec 2014 19:53:53 +0000 (20:53 +0100)]
avcodec/vp3: Fix offset handling

Fixes use of uninitialized memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo_enc: remove rtp_mode=0 for H261
Michael Niedermayer [Thu, 18 Dec 2014 22:32:42 +0000 (23:32 +0100)]
avcodec/mpegvideo_enc: remove rtp_mode=0 for H261

Suggested-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/constants: fix alignment of pw_255
James Almer [Fri, 19 Dec 2014 19:18:43 +0000 (16:18 -0300)]
x86/constants: fix alignment of pw_255

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdd FFMPEG_VERSION into the binary libs
Michael Niedermayer [Fri, 19 Dec 2014 17:04:40 +0000 (18:04 +0100)]
Add FFMPEG_VERSION into the binary libs

This simplifies identifying from which revision a binary of a lib came from

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegenc: replace always enabled asserts by av_assert0()
Michael Niedermayer [Fri, 19 Dec 2014 14:08:44 +0000 (15:08 +0100)]
avformat/mpegenc: replace always enabled asserts by av_assert0()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vsrc_life: Use av_freep() avoid leaving stale pointers in memory
Michael Niedermayer [Fri, 19 Dec 2014 14:04:56 +0000 (15:04 +0100)]
avfilter/vsrc_life: Use av_freep() avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_libopencv: use av_freep() avoid leaving stale pointers in memory
Michael Niedermayer [Fri, 19 Dec 2014 14:04:34 +0000 (15:04 +0100)]
avfilter/vf_libopencv: use av_freep() avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavutil: Added cbc mode to cast128
Supraja Meedinti [Thu, 18 Dec 2014 09:56:32 +0000 (15:26 +0530)]
libavutil: Added cbc mode to cast128

Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Previous version reviewed-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9/x86: intra prediction sse2/32bit support.
Ronald S. Bultje [Tue, 16 Dec 2014 03:13:52 +0000 (22:13 -0500)]
vp9/x86: intra prediction sse2/32bit support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9/x86: invert hu_ipred left array ordering.
Ronald S. Bultje [Tue, 16 Dec 2014 03:12:50 +0000 (22:12 -0500)]
vp9/x86: invert hu_ipred left array ordering.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cee4490b521fd0d02476d46aa2598af24fb8d686'
Michael Niedermayer [Fri, 19 Dec 2014 12:36:25 +0000 (13:36 +0100)]
Merge commit 'cee4490b521fd0d02476d46aa2598af24fb8d686'

* commit 'cee4490b521fd0d02476d46aa2598af24fb8d686':
  on2avc: check number of channels

See: 550f3e9df3410b3dd975e590042c0d83e20a8da3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd423dd72be451462c6fb1cbbe313bed0194001ab'
Michael Niedermayer [Fri, 19 Dec 2014 12:30:25 +0000 (13:30 +0100)]
Merge commit 'd423dd72be451462c6fb1cbbe313bed0194001ab'

* commit 'd423dd72be451462c6fb1cbbe313bed0194001ab':
  smc: fix the bounds check

Conflicts:
libavcodec/smc.c

See: c727401aa9d62335e89d118a5b4e202edf39d905
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0b39ac6f54505a538c21fe49a626de94c518c903'
Michael Niedermayer [Fri, 19 Dec 2014 12:14:09 +0000 (13:14 +0100)]
Merge commit '0b39ac6f54505a538c21fe49a626de94c518c903'

* commit '0b39ac6f54505a538c21fe49a626de94c518c903':
  gifdec: refactor interleave end handling

Conflicts:
libavcodec/gifdec.c

See: 8f1457864be8fb9653643519dea1c6492f1dde57
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/rtp_h261: Replace restrict with av_restrict.
Carl Eugen Hoyos [Fri, 19 Dec 2014 12:25:51 +0000 (13:25 +0100)]
lavf/rtp_h261: Replace restrict with av_restrict.

Fixes compilation on Windows.

5 years agoMerge commit '17ba719d9ba30c970f65747f42d5fbb1e447ca28'
Michael Niedermayer [Fri, 19 Dec 2014 12:04:35 +0000 (13:04 +0100)]
Merge commit '17ba719d9ba30c970f65747f42d5fbb1e447ca28'

* commit '17ba719d9ba30c970f65747f42d5fbb1e447ca28':
  mmvideo: check frame dimensions

See: 8b0e96e1f21b761ca15dbb470cd619a1ebf86c3e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '88626e5af8d006e67189bf10b96b982502a7e8ad'
Michael Niedermayer [Fri, 19 Dec 2014 11:56:08 +0000 (12:56 +0100)]
Merge commit '88626e5af8d006e67189bf10b96b982502a7e8ad'

* commit '88626e5af8d006e67189bf10b96b982502a7e8ad':
  jvdec: check frame dimensions

See: 105654e376a736d243aef4a1d121abebce912e6b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '809c3023b699c54c90511913d3b6140dd2436550'
Michael Niedermayer [Fri, 19 Dec 2014 11:45:56 +0000 (12:45 +0100)]
Merge commit '809c3023b699c54c90511913d3b6140dd2436550'

* commit '809c3023b699c54c90511913d3b6140dd2436550':
  mjpegdec: check for pixel format changes

Conflicts:
libavcodec/mjpegdec.c

See: 5c378d6a6df8243f06c87962b873bd563e58cd39
See: a2f680c7bc7642c687aeb4e14d00ac74833c7a09
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '64f7575fbd64e5b65d5c644347408588c776f1fe'
Michael Niedermayer [Fri, 19 Dec 2014 11:24:36 +0000 (12:24 +0100)]
Merge commit '64f7575fbd64e5b65d5c644347408588c776f1fe'

* commit '64f7575fbd64e5b65d5c644347408588c776f1fe':
  mov: avoid a memleak when multiple stss boxes are present

Conflicts:
libavformat/mov.c

See: 5ab882d7283f57560c889919c35f2688253b1d9c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoon2avc: check number of channels
Michael Niedermayer [Sat, 4 Oct 2014 20:15:07 +0000 (22:15 +0200)]
on2avc: check number of channels

Fixes invalid memory access.

CC: libav-stable@libav.org
Bug-ID: CVE-2014-8549
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agosmc: fix the bounds check
Michael Niedermayer [Fri, 3 Oct 2014 20:50:45 +0000 (22:50 +0200)]
smc: fix the bounds check

Fixes invalid writes when there are more blocks in a run than total
remaining blocks.

CC: libav-stable@libav.org
Bug-ID: CVE-2014-8548
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agogifdec: refactor interleave end handling
Michael Niedermayer [Fri, 3 Oct 2014 18:15:52 +0000 (20:15 +0200)]
gifdec: refactor interleave end handling

Fixes invalid writes with very small image heights.

CC: libav-stable@libav.org
Bug-ID: CVE-2014-8547
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agommvideo: check frame dimensions
Anton Khirnov [Sun, 14 Dec 2014 20:01:59 +0000 (21:01 +0100)]
mmvideo: check frame dimensions

The frame size must be set by the caller and each dimension must be a
multiple of 2.

CC: libav-stable@libav.org
Bug-ID: CVE-2014-8543
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
5 years agojvdec: check frame dimensions
Anton Khirnov [Sun, 14 Dec 2014 20:01:59 +0000 (21:01 +0100)]
jvdec: check frame dimensions

The frame size must be set by the caller and each dimension must be a
multiple of 8.

CC: libav-stable@libav.org
Bug-ID: CVE-2014-8542
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
5 years agomjpegdec: check for pixel format changes
Anton Khirnov [Sun, 14 Dec 2014 19:52:13 +0000 (20:52 +0100)]
mjpegdec: check for pixel format changes

Fixes possible invalid memory access.

Based on code by Michael Niedermayer <michaelni@gmx.at>

CC: libav-stable@libav.org
Bug-ID: CVE-2014-8541
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
5 years agomov: avoid a memleak when multiple stss boxes are present
Anton Khirnov [Tue, 12 Aug 2014 14:39:10 +0000 (14:39 +0000)]
mov: avoid a memleak when multiple stss boxes are present

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
5 years agoMerge commit '210461c0a83a5625560fa1d92229200dc7fb869b'
Michael Niedermayer [Fri, 19 Dec 2014 04:37:11 +0000 (05:37 +0100)]
Merge commit '210461c0a83a5625560fa1d92229200dc7fb869b'

* commit '210461c0a83a5625560fa1d92229200dc7fb869b':
  imgconvert: check memory allocations and propagate errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '596b5c488fa1d40f114a64d3b73e1863cab073fb'
Michael Niedermayer [Fri, 19 Dec 2014 04:36:20 +0000 (05:36 +0100)]
Merge commit '596b5c488fa1d40f114a64d3b73e1863cab073fb'

* commit '596b5c488fa1d40f114a64d3b73e1863cab073fb':
  wma: check memory allocations and propagate errors

Conflicts:
libavcodec/wma.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '63be97ec403023fb664798432acedaf6e6922527'
Michael Niedermayer [Fri, 19 Dec 2014 04:15:40 +0000 (05:15 +0100)]
Merge commit '63be97ec403023fb664798432acedaf6e6922527'

* commit '63be97ec403023fb664798432acedaf6e6922527':
  lavfi: always check av_expr_parse_and_eval() return value

not merged, this is incorrect

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788'
Michael Niedermayer [Fri, 19 Dec 2014 04:13:59 +0000 (05:13 +0100)]
Merge commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788'

* commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788':
  xcbgrab: Move NULL check before pointer dereference

Conflicts:
libavdevice/xcbgrab.c

See: e86df0206f06b8d1e97e2b60db8f74a398d53127
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5ac06633cb63fcc51f2471a3478b44d3f010b16b'
Michael Niedermayer [Fri, 19 Dec 2014 04:06:07 +0000 (05:06 +0100)]
Merge commit '5ac06633cb63fcc51f2471a3478b44d3f010b16b'

* commit '5ac06633cb63fcc51f2471a3478b44d3f010b16b':
  takdec: check av_samples_get_buffer_size() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '16c7a8a142277aa3c98b4802ee57daaebe6999e5'
Michael Niedermayer [Fri, 19 Dec 2014 04:04:43 +0000 (05:04 +0100)]
Merge commit '16c7a8a142277aa3c98b4802ee57daaebe6999e5'

* commit '16c7a8a142277aa3c98b4802ee57daaebe6999e5':
  aacps: invert the order of parameters of ipdopd_reset()

See: 9f36ec6aa936515a703f6d7ff32826aa28684f1e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '76ccf114a6c107218e2a1948afc1d0fb3ac7ba0b'
Michael Niedermayer [Fri, 19 Dec 2014 04:04:19 +0000 (05:04 +0100)]
Merge commit '76ccf114a6c107218e2a1948afc1d0fb3ac7ba0b'

* commit '76ccf114a6c107218e2a1948afc1d0fb3ac7ba0b':
  rtsp: check ffurl_get_file_handle() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e'
Michael Niedermayer [Fri, 19 Dec 2014 03:57:25 +0000 (04:57 +0100)]
Merge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e'

* commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e':
  check memory errors from av_strdup()

Conflicts:
avprobe.c
libavformat/matroskaenc.c
libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9745f19ffc9031ce480e43d7cf1053b58100d70f'
Michael Niedermayer [Fri, 19 Dec 2014 03:53:39 +0000 (04:53 +0100)]
Merge commit '9745f19ffc9031ce480e43d7cf1053b58100d70f'

* commit '9745f19ffc9031ce480e43d7cf1053b58100d70f':
  assdec: check the right variable

Conflicts:
libavcodec/assdec.c

See: cc7342f712c0822c3e8f4c36fc55632c59aabac9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '971099ff5a85377579eb5b8d3620e283957f097e'
Michael Niedermayer [Fri, 19 Dec 2014 03:44:39 +0000 (04:44 +0100)]
Merge commit '971099ff5a85377579eb5b8d3620e283957f097e'

* commit '971099ff5a85377579eb5b8d3620e283957f097e':
  aacenc: correctly check returned value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d'
Michael Niedermayer [Fri, 19 Dec 2014 03:43:53 +0000 (04:43 +0100)]
Merge commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d'

* commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d':
  lcl: return an appropriate error code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b'
Michael Niedermayer [Fri, 19 Dec 2014 03:42:59 +0000 (04:42 +0100)]
Merge commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b'

* commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b':
  mpegts: check get16() return value

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