wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
68612 commits 40 branches 405 tags 230 MiB
Commit graph

68612 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Volkert
1a971d33eb 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>
 2014-12-19 22:39:29 +01:00
Michael Niedermayer
c3e6a55956 avcodec/vp3: Fix offset handling 
Fixes use of uninitialized memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 20:53:53 +01:00
Michael Niedermayer
2df5b506ca avcodec/mpegvideo_enc: remove rtp_mode=0 for H261 
Suggested-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 20:50:02 +01:00
James Almer
a4d62f7775 x86/constants: fix alignment of pw_255 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 20:21:34 +01:00
Michael Niedermayer
649c158e8c 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>
 2014-12-19 19:32:40 +01:00
Michael Niedermayer
869b56cae6 avformat/mpegenc: replace always enabled asserts by av_assert0() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 15:18:31 +01:00
Michael Niedermayer
b44ae59b70 avfilter/vsrc_life: Use av_freep() avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 15:04:56 +01:00
Michael Niedermayer
4d48ea3c4b avfilter/vf_libopencv: use av_freep() avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 15:04:34 +01:00
Supraja Meedinti
4e1ecfe214 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>
 2014-12-19 14:35:29 +01:00
Ronald S. Bultje
bdc1e3e3b2 vp9/x86: intra prediction sse2/32bit support. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 14:07:19 +01:00
Ronald S. Bultje
b6e1711223 vp9/x86: invert hu_ipred left array ordering. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 14:07:18 +01:00
Michael Niedermayer
e67496fe9d Merge commit 'cee4490b52' 
* commit 'cee4490b52':
  on2avc: check number of channels

See: 550f3e9df3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 13:39:41 +01:00
Michael Niedermayer
c266d0e1bd Merge commit 'd423dd72be' 
* commit 'd423dd72be':
  smc: fix the bounds check

Conflicts:
	libavcodec/smc.c

See: c727401aa9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 13:30:55 +01:00
Michael Niedermayer
8af8833591 Merge commit '0b39ac6f54' 
* commit '0b39ac6f54':
  gifdec: refactor interleave end handling

Conflicts:
	libavcodec/gifdec.c

See: 8f1457864b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 13:28:57 +01:00
Carl Eugen Hoyos
96ff6d3805 lavf/rtp_h261: Replace restrict with av_restrict. 
Fixes compilation on Windows.
 2014-12-19 13:25:51 +01:00
Michael Niedermayer
6c7b153d97 Merge commit '17ba719d9b' 
* commit '17ba719d9b':
  mmvideo: check frame dimensions

See: 8b0e96e1f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 13:05:49 +01:00
Michael Niedermayer
f346e37aa2 Merge commit '88626e5af8' 
* commit '88626e5af8':
  jvdec: check frame dimensions

See: 105654e376
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 13:04:03 +01:00
Michael Niedermayer
6c68522a2a Merge commit '809c3023b6' 
* commit '809c3023b6':
  mjpegdec: check for pixel format changes

Conflicts:
	libavcodec/mjpegdec.c

See: 5c378d6a6d
See: a2f680c7bc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 12:49:23 +01:00
Michael Niedermayer
24af050c2f Merge commit '64f7575fbd' 
* commit '64f7575fbd':
  mov: avoid a memleak when multiple stss boxes are present

Conflicts:
	libavformat/mov.c

See: 5ab882d728
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 12:31:52 +01:00
Michael Niedermayer
cee4490b52 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>
 2014-12-19 08:01:47 +01:00
Michael Niedermayer
d423dd72be 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>
 2014-12-19 08:01:47 +01:00
Michael Niedermayer
0b39ac6f54 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>
 2014-12-19 08:01:47 +01:00
Anton Khirnov
17ba719d9b 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
 2014-12-19 08:01:46 +01:00
Anton Khirnov
88626e5af8 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
 2014-12-19 08:01:46 +01:00
Anton Khirnov
809c3023b6 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
 2014-12-19 08:01:46 +01:00
Anton Khirnov
64f7575fbd mov: avoid a memleak when multiple stss boxes are present 
CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
 2014-12-19 08:01:46 +01:00
Michael Niedermayer
c89751aa21 Merge commit '210461c0a8' 
* commit '210461c0a8':
  imgconvert: check memory allocations and propagate errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 05:37:26 +01:00
Michael Niedermayer
8ccfafa7b4 Merge commit '596b5c488f' 
* commit '596b5c488f':
  wma: check memory allocations and propagate errors

Conflicts:
	libavcodec/wma.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 05:36:20 +01:00
Michael Niedermayer
8c9a23833d Merge commit '63be97ec40' 
* commit '63be97ec40':
  lavfi: always check av_expr_parse_and_eval() return value

not merged, this is incorrect

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 05:28:09 +01:00
Michael Niedermayer
c054cff87a Merge commit '9e06327ecb' 
* commit '9e06327ecb':
  xcbgrab: Move NULL check before pointer dereference

Conflicts:
	libavdevice/xcbgrab.c

See: e86df0206f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 05:14:38 +01:00
Michael Niedermayer
d05b154b5b Merge commit '5ac06633cb' 
* commit '5ac06633cb':
  takdec: check av_samples_get_buffer_size() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 05:06:23 +01:00
Michael Niedermayer
69234e29ad Merge commit '16c7a8a142' 
* commit '16c7a8a142':
  aacps: invert the order of parameters of ipdopd_reset()

See: 9f36ec6aa9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 05:05:23 +01:00
Michael Niedermayer
bf6e332cb4 Merge commit '76ccf114a6' 
* commit '76ccf114a6':
  rtsp: check ffurl_get_file_handle() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 05:04:24 +01:00
Michael Niedermayer
988d27b802 Merge commit 'b1306823d0' 
* commit 'b1306823d0':
  check memory errors from av_strdup()

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 04:57:25 +01:00
Michael Niedermayer
76a8127a45 Merge commit '9745f19ffc' 
* commit '9745f19ffc':
  assdec: check the right variable

Conflicts:
	libavcodec/assdec.c

See: cc7342f712
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 04:54:27 +01:00
Michael Niedermayer
5387b0cbfb Merge commit '971099ff5a' 
* commit '971099ff5a':
  aacenc: correctly check returned value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 04:45:32 +01:00
Michael Niedermayer
445ec2dfcb Merge commit 'ac467d94fa' 
* commit 'ac467d94fa':
  lcl: return an appropriate error code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 04:44:08 +01:00
Michael Niedermayer
6781ec6714 Merge commit '8b263331c5' 
* commit '8b263331c5':
  mpegts: check get16() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 04:43:41 +01:00
Michael Niedermayer
5a1cd796e2 Merge commit '430a816859' 
* commit '430a816859':
  oggdec: add support for VP8 demuxing

Conflicts:
	Changelog
	libavformat/oggparsevp8.c
	libavformat/version.h

See: d890db5f53
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 04:36:45 +01:00
Michael Niedermayer
934f2d2f5c Merge commit '38129c26c5' 
* commit '38129c26c5':
  cmdutils: check file access functions return values

Conflicts:
	cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 04:31:17 +01:00
Michael Niedermayer
ff4f2036de Merge commit 'c63dd3f0a4' 
* commit 'c63dd3f0a4':
  a64multi: check elbg return values

Conflicts:
	libavcodec/a64multienc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 04:21:13 +01:00
Michael Niedermayer
bb7ad47ddf Merge commit '3beb9cbad3' 
* commit '3beb9cbad3':
  roqvideo: check memory allocations and propagate errors

Conflicts:
	libavcodec/roqvideoenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 04:20:30 +01:00
Michael Niedermayer
16f0618200 Merge commit 'ae2d41ec87' 
* commit 'ae2d41ec87':
  elbg: check memory allocations and propagate errors

Conflicts:
	libavcodec/elbg.c
	libavcodec/elbg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 04:10:17 +01:00
Michael Niedermayer
bce06eb059 Merge commit '5d839778b9' 
* commit '5d839778b9':
  lavu: Refactor side data wiping

Conflicts:
	libavutil/frame.c

See: a400edbb6d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 03:57:59 +01:00
Michael Niedermayer
1137ccef70 Merge commit 'effa7d2a6a' 
* commit 'effa7d2a6a':
  fate: add test for offset theora

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 03:55:02 +01:00
Michael Niedermayer
6fcdcc414b Merge commit '67fc8a15e4' 
* commit '67fc8a15e4':
  theora: support different visible and coded frame size

Conflicts:
	libavcodec/vp3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 03:42:16 +01:00
Michael Niedermayer
3e889713ce Merge commit 'a381e0cec8' 
* commit 'a381e0cec8':
  fate: add a DPX parser test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 03:33:42 +01:00
Michael Niedermayer
2e97437657 Merge commit '87bd298abe' 
* commit '87bd298abe':
  DPX parser

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

See: 8ec328668a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 03:30:40 +01:00
Michael Niedermayer
9aabe66781 Merge commit '3a3790b8f8' 
* commit '3a3790b8f8':
  tiff: support encoding and decoding 64bit images

Conflicts:
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/version.h

See: c714cd3bd4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 03:19:23 +01:00
Michael Niedermayer
c8e05c438f Merge commit '59f0275dd0' 
* commit '59f0275dd0':
  movenc: Adjust the pts of new fragments similarly to what is done for dts

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 02:58:16 +01:00