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

38235 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Niedermayer
6c76f3dfaa Merge commit 'd1c490448c' into release/0.10 
* commit 'd1c490448c':
  mpegvideo: remove last_picture_ptr / h264 assert.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-11 21:43:52 +01:00
Michael Niedermayer
9d94589852 Merge commit '9858a723cb' into release/0.10 
* commit '9858a723cb':
  elbg: Fix an assert

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-11 21:37:53 +01:00
Michael Niedermayer
99ba7ee0eb Merge commit 'ce57531a88' into release/0.10 
* commit 'ce57531a88':
  swscale: Remove two bogus asserts

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-11 21:37:09 +01:00
Michael Niedermayer
c9a38ffe2f Merge commit '233d1b4861' into release/0.10 
* commit '233d1b4861':
  h264_refs: Fix debug tprintf argument types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-11 21:36:34 +01:00
Michael Niedermayer
60190d8612 Merge commit '90a2359fef' into release/0.10 
* commit '90a2359fef':
  nutdec: Remove unused and broken debug function stub

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-11 21:32:10 +01:00
Michael Niedermayer
3832db1223 Merge commit '57c36de726' into release/0.10 
* commit '57c36de726':
  vp8: avoid race condition on segment map.

Conflicts:
	libavcodec/vp8.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-11 21:29:31 +01:00
Michael Niedermayer
2a4d9b9af0 Merge commit '8152b02f33' into release/0.10 
* commit '8152b02f33':
  arm/neon: dsputil: use correct size specifiers on vld1/vst1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-11 21:11:07 +01:00
Michael Niedermayer
6a28ae55c4 Merge commit '9fa9d471a7' into release/0.10 
* commit '9fa9d471a7':
  arm: dsputil: prettify some conditional instructions in put_pixels macros

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-11 21:10:31 +01:00
Michael Niedermayer
78518fb928 Merge commit '6dd19ffd39' into release/0.10 
* commit '6dd19ffd39':
  arm: dsputil: fix overreads in put/avg_pixels functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-11 21:10:08 +01:00
Michael Niedermayer
d1c490448c mpegvideo: remove last_picture_ptr / h264 assert. 
This assert is no longer true since h264 error concealment needs
last_picture_ptr to be set.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 91672504a4)
Signed-off-by: Diego Biurrun <diego@biurrun.de>

Conflicts:
	libavcodec/mpegvideo.c
 2014-08-21 05:40:26 -07:00
Michael Niedermayer
9858a723cb elbg: Fix an assert 
It seems the condition was flipped from what was intended.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 2c340596ca)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-21 05:40:26 -07:00
Diego Biurrun
ce57531a88 swscale: Remove two bogus asserts 
(cherry picked from commit b9141aa346)
Signed-off-by: Diego Biurrun <diego@biurrun.de>

Conflicts:
	libswscale/swscale.c
 2014-08-21 05:40:26 -07:00
Diego Biurrun
233d1b4861 h264_refs: Fix debug tprintf argument types 
(cherry picked from commit 6c5b0517e0)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-20 10:19:33 -07:00
Diego Biurrun
90a2359fef nutdec: Remove unused and broken debug function stub 
(cherry picked from commit 83655442fa)
Signed-off-by: Diego Biurrun <diego@biurrun.de>

Conflicts:
	libavformat/nutdec.c
 2014-08-20 10:11:31 -07:00
Aaron Colwell
57c36de726 vp8: avoid race condition on segment map. 
This change avoids accessing the segment map of the previous frame if
segmentation is not enabled for the current frame. The caller of
decode_mb_mode() only calls ff_thread_await_progress() on the reference
segmentation index array if segmentation is enabled, so Chromium's TSAN
will report a race when accessing this data while segmentation is not
enabled.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 30011bf201)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-19 06:15:26 -07:00
Mans Rullgard
8152b02f33 arm/neon: dsputil: use correct size specifiers on vld1/vst1 
Change the size specifiers to match the actual element sizes
of the data.  This makes no practical difference with strict
alignment checking disabled (the default) other than somewhat
documenting the code.  With strict alignment checking on, it
avoids trapping the unaligned loads.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2014-08-17 09:52:39 +02:00
Mans Rullgard
9fa9d471a7 arm: dsputil: prettify some conditional instructions in put_pixels macros 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2014-08-17 09:52:23 +02:00
Mans Rullgard
6dd19ffd39 arm: dsputil: fix overreads in put/avg_pixels functions 
The vertically interpolating variants of these functions read
ahead one line to optimise the loop.  On the last line processed,
this might be outside the buffer.  Fix these invalid reads by
processing the last line outside the loop.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2014-08-17 09:52:13 +02:00
Michael Niedermayer
c13b19a5bc Update for 0.10.15 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 20:44:27 +02:00
Mans Rullgard
394f4ee61e pcmenc: set correct bitrate value 
This fixes a bogus bitrate value in the header of WAV files with
alaw/ulaw audio.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 7d7b40f48a)

Conflicts:

	libavcodec/pcm.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 20:36:47 +02:00
Michael Niedermayer
497d661262 Merge commit 'b5d7b80a7e' into release/0.10 
* commit 'b5d7b80a7e':
  ffv1dec: check that global parameters do not change in version 0/1

Conflicts:
	libavcodec/ffv1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 20:28:37 +02:00
Michael Niedermayer
8044ab94e4 Merge commit '452e343295' into release/0.10 
* commit '452e343295':
  avcodec: Add more missing #includes for ff_get_buffer()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 20:26:07 +02:00
Michael Niedermayer
257188acea Merge commit '5a2d1913a9' into release/0.10 
* commit '5a2d1913a9':
  Prepare for 0.8.15 Release

Conflicts:
	RELEASE

Not merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 20:25:48 +02:00
Michael Niedermayer
80a77c0c5b avcodec/libspeexdec: fix missing header includes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 20:13:11 +02:00
Michael Niedermayer
854fa0d1ab Merge commit 'e24d1cbc4e' into release/0.10 
* commit 'e24d1cbc4e':
  lavf: Fix leftovers from the ff_get_buffer patch

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 20:01:58 +02:00
Michael Niedermayer
5d790cdb9e Merge commit 'c98d164a6a' into release/0.10 
* commit 'c98d164a6a':
  configure: Check for -Werror parameters on clang

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 20:01:22 +02:00
Michael Niedermayer
bb015b519e Merge commit '0ab76ddf31' into release/0.10 
* commit '0ab76ddf31':
  avcodec: Introduce ff_get_buffer

Conflicts:
	libavcodec/8svx.c
	libavcodec/dpcm.c
	libavcodec/utils.c
	libavcodec/vmdav.c
	libavcodec/yop.c

See: 668494acd8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 19:53:37 +02:00
Michael Niedermayer
acf7c5b8ee Merge commit '042c25f54b' into release/0.10 
* commit '042c25f54b':
  Update Changelog for v0.8.14

Conflicts:
	Changelog

Not merged as the Changelog isnt correct for FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 19:13:07 +02:00
Michael Niedermayer
a5a2f8ac5a Merge commit 'dcc68de942' into release/0.10 
* commit 'dcc68de942':
  vp3: Copy all 3 frames for thread updates

See: 247d30a7db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 19:11:33 +02:00
Michael Niedermayer
437a0ae1a1 Merge commit 'ebe2292eaf' into release/0.10 
* commit 'ebe2292eaf':
  mpegts: Do not try to write a PMT larger than SECTION_SIZE

Conflicts:
	libavformat/mpegtsenc.c

See: 68b14c044a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 19:09:33 +02:00
Michael Niedermayer
da19bfb287 Merge commit 'd86df7dd49' into release/0.10 
* commit 'd86df7dd49':
  mpegts: Define the section length with a constant

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 19:01:28 +02:00
Michael Niedermayer
a94fe0e151 Merge commit 'a79e58cdc6' into release/0.10 
* commit 'a79e58cdc6':
  Update Changelog for v0.8.14
  Prepare for 0.8.14 Release

Conflicts:
	Changelog
	RELEASE

No change as this does not apply to FFmpeg 1:1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 19:00:30 +02:00
Michael Niedermayer
688ab26604 Merge commit 'c79cf0129e' into release/0.10 
* commit 'c79cf0129e':
  error_concealment: avoid using the picture if not fully setup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 18:58:09 +02:00
Michael Niedermayer
a2c6cb260f avcodec/svq1dec: Fix multiple bugs from "svq1: do not modify the input packet" 
Add padding, clear size, use the correct pointer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4213fc5b9e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 18:51:33 +02:00
Michael Niedermayer
aed8f48545 Merge commit '9d5f4f0253' into release/0.10 
* commit '9d5f4f0253':
  svq1: do not modify the input packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 18:51:22 +02:00
Michael Niedermayer
6596f5c3aa Merge commit 'cf6b2a0ad2' into release/0.10 
* commit 'cf6b2a0ad2':
  cdgraphics: do not return 0 from the decode function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 18:47:24 +02:00
Michael Niedermayer
a457115f0f Merge commit '3aebdffb01' into release/0.10 
* commit '3aebdffb01':
  cdgraphics: switch to bytestream2

Conflicts:
	libavcodec/cdgraphics.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 18:25:32 +02:00
Michael Niedermayer
b5d7b80a7e ffv1dec: check that global parameters do not change in version 0/1 
Such changes are neither allowed nor supported

Found-by: ami_stuff
Bug-Id: CVE-2013-7020
CC: libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit da7d839a0d)
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Conflicts:
	libavcodec/ffv1dec.c
 2014-08-12 10:49:43 +00:00
Michael Niedermayer
90241187ce Merge commit 'a1804df66a' into release/0.10 
* commit 'a1804df66a':
  huffyuvdec: check width size for yuv422p

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 20:21:22 +02:00
Michael Niedermayer
e719bfc403 Merge commit 'e17dc0a254' into release/0.10 
* commit 'e17dc0a254':
  mmvideo: check horizontal coordinate too

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 20:20:02 +02:00
Michael Niedermayer
7d42ede8fe Merge commit '4a6622550a' into release/0.10 
* commit '4a6622550a':
  huffyuv: Check and propagate function return values

Conflicts:
	libavcodec/huffyuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 19:58:37 +02:00
Michael Niedermayer
2ec8e46550 Merge commit '50493f1f7d' into release/0.10 
* commit '50493f1f7d':
  twinvq: fix out of bounds array access

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 19:42:46 +02:00
Michael Niedermayer
b5ae0e349a Merge commit '3e60501f31' into release/0.10 
* commit '3e60501f31':
  h264: slice-mt: check master context for valid current_picture_ptr

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 19:42:15 +02:00
Michael Niedermayer
0a83007cee Merge commit '7585a6254b' into release/0.10 
* commit '7585a6254b':
  h264: prevent theoretical infinite loop in SEI parsing

Conflicts:
	libavcodec/h264_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 19:41:51 +02:00
Michael Niedermayer
330791c2ae Merge commit '184c79729d' into release/0.10 
* commit '184c79729d':
  h264_sei: check SEI size

Conflicts:
	libavcodec/h264_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 19:30:07 +02:00
Michael Niedermayer
5404bf29c3 Merge commit 'a465ed5707' into release/0.10 
* commit 'a465ed5707':
  pgssubdec: Check RLE size before copying

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 19:29:48 +02:00
Michael Niedermayer
2c10833d5e Merge commit '976f2e0a54' into release/0.10 
* commit '976f2e0a54':
  x86: Fix linking with some or all of yasm, mmx, optimizations disabled

Conflicts:
	libavcodec/x86/mpegaudiodec_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 19:20:25 +02:00
Michael Niedermayer
cdfd61b78b Merge commit '28f2d3c5a5' into release/0.10 
* commit '28f2d3c5a5':
  cmdutils: Conditionally compile libswscale-related bits

Conflicts:
	cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 19:15:49 +02:00
Michael Niedermayer
f3ae90621e Merge commit '277103e07f' into release/0.10 
* commit '277103e07f':
  video4linux2: Avoid a floating point exception

Conflicts:
	avconv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 19:13:54 +02:00
Michael Niedermayer
c4dabc38a3 Merge commit 'e4fdfdf65d' into release/0.10 
* commit 'e4fdfdf65d':
  vf_select: Drop a debug av_log with an unchecked double to enum conversion

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 19:12:46 +02:00