generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
53,355 Commits 24 Branches 241 Tags
Commit Graph

24063 Commits

Author SHA1 Message Date
multiple authors
7a4885600f libmpcodecs/vf_spp: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:53:53 +01:00
Diego Biurrun
25841dfe80 Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter. 
This avoids SIMD-optimized functions having to sign-extend their
line size argument manually to be able to do pointer arithmetic.
 2013-02-05 12:59:12 +01:00
Michael Niedermayer
5a83115130 ffv1: check for malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 00:37:20 +01:00
Michael Niedermayer
b77d94dc6c ffv1enc: check for malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 00:37:20 +01:00
Michael Niedermayer
fc0d069feb flacdec: silence several "warning: X may be used uninitialized in this function" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-04 22:59:02 +01:00
Michael Niedermayer
96a08d8627 wmavoice: silence may be used uninitialized warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-04 22:59:02 +01:00
Michael Niedermayer
63c61f0be0 vc1dec: Fix 2 "warning: may be used uninitialized in this function" 
Initialize pointers to NULL for safety

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-04 14:30:40 +01:00
Michael Niedermayer
c67ddb56da Merge remote-tracking branch 'mjbshaw/master' 
* mjbshaw/master:
  libopenjpegenc: make dci compliant j2c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-04 13:22:56 +01:00
Michael Niedermayer
a2bff49e26 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegvideo: simplify REBASE_PICTURE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-04 12:37:15 +01:00
Michaël Cinquin
60f06f986f libopenjpegenc: make dci compliant j2c 
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
 2013-02-03 23:53:39 -07:00
Anton Khirnov
d9df93efbf mpegvideo: simplify REBASE_PICTURE 
Always evaluate to NULL when the source Picture is not located in the
MpegEncContext.picture array. That will only happen for
next/last_picture_ptr when updating the thread context during h264 frame
threaded decoding, where they will point to elements of ref_list. Since
ref_list is not copied during updating the context and is invalid until
it is constructed for the current slice, there is no point in doing
anything complicated with next/last_picture_ptr, as they will get
updated when the ref_list is filled.
 2013-02-04 06:17:15 +01:00
Michael Niedermayer
d106679fb5 qdm2: disable superblocktype_2_3==0 code 
The code is untested and contained bugs, we need a sample if any files
use this branch.

Suggested-by: Roberto Togni
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-03 19:59:00 +01:00
Michael Niedermayer
ccfd8cffe8 qdm2: Fix data type used in multiplication. 
Avoid unintended truncation.
Fixes CID700555

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-03 19:56:04 +01:00
Michael Niedermayer
4d37d2bfc5 put_vp_no_rnd_pixels8_l2_mmx: fix type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-03 17:21:06 +01:00
Michael Niedermayer
cb573f7fbc avcodec/x86: Add daniels copyright to the recent gcc->yasm convertions he did. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-03 13:50:44 +01:00
James Almer
d1511c02f4 proresdsp: Fix checkheaders 
It's been broken since commit ac89875

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-03 13:08:36 +01:00
Michael Niedermayer
695af8eed6 h264: skip error concealment when SPS and slices are mismatching 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-02 21:13:25 +01:00
Michael Niedermayer
0e9b9a6748 flacdec: skip in stream header packets 
This prevents warning messages on chained oggs with some demuxers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-02 19:58:13 +01:00
Michael Niedermayer
cdc48860a8 h264: silence warning about array index being out of bounds 
The index is not out of bounds, adding an assert makes gcc
realize this.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-02 16:20:19 +01:00
Ronald S. Bultje
8af915c21b vp56: remove clear_blocks call, and clear alpha plane U/V DC only. 
The non-alpha and alpha-Y planes are cleared in the idct_put/add()
calls. For the alpha U/V planes, we only care about the DC for entropy
context prediction purposes, the rest of the data is unused.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-01 23:51:34 +01:00
Michael Niedermayer
911e270688 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Use proper "" quotes for local header #includes
  ppc: fmtconvert: Drop two unused variables.
  bink demuxer: set framerate.

Conflicts:
	libavcodec/kbdwin.c
	libavcodec/ppc/fmtconvert_altivec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-01 14:34:18 +01:00
Michael Niedermayer
69a6eddd60 Merge commit 'f2960097e42ddf9a356bab6547f87906f6999e0a' 
* commit 'f2960097e42ddf9a356bab6547f87906f6999e0a':
  bink: fix a check for the first frame.
  doc/developer: Drop obsolete MPlayer reference
  doc/developer: Add ISC license to list of acceptable licenses
  doc/developer: Add web links for all suggested licenses

Conflicts:
	doc/developer.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-01 14:15:30 +01:00
Diego Biurrun
6c1a7d07eb Use proper "" quotes for local header #includes 2013-02-01 12:51:15 +01:00
Diego Biurrun
4eef2ed707 ppc: fmtconvert: Drop two unused variables. 2013-02-01 12:51:13 +01:00
Anton Khirnov
f2960097e4 bink: fix a check for the first frame. 
Packet pts is a very unreliable indicator, use
AVCodecContext.frame_number instead.
 2013-02-01 12:41:31 +01:00
Michael Niedermayer
ffd02d0c19 Merge remote-tracking branch 'mjbshaw/master' 
* mjbshaw/master:
  libopenjpegenc: simplify switch statement
  libopenjpegenc: add support for pix fmt gbrp (8-16 bit)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-01 02:33:42 +01:00
Sebastian Sandberg
c6779c5131 vc1dec: fieldtx is only valid for interlaced frames 
the fieldtx_plane is not cleared for interlaced fields

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-01 00:48:05 +01:00
Michael Bradshaw
28f36dce3e libopenjpegenc: simplify switch statement 
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
 2013-01-31 16:03:58 -07:00
Michael Bradshaw
c58c67398d libopenjpegenc: add support for pix fmt gbrp (8-16 bit) 
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
 2013-01-31 15:55:00 -07:00
Michael Niedermayer
131fac1c12 vc1dec: fix block_off 
Fixes corruption of motion_val

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-31 23:22:11 +01:00
Michael Niedermayer
dd87d4a318 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: hpel: Move {avg,put}_pixels16_sse2 to hpeldsp
  configure: Add a comment indicating why uclibc is checked before glibc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-31 20:03:36 +01:00
Michael Niedermayer
324498f824 Merge commit 'a65f965c04bfa27adedc0409c14cc05903f483d0' 
* commit 'a65f965c04bfa27adedc0409c14cc05903f483d0':
  mpegvideo: Do REBASE_PICTURE with byte pointers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-31 19:19:37 +01:00
Michael Niedermayer
ed341549bb Merge commit 'a5ba798c16d0614d982a76755fdd72b37d437170' 
* commit 'a5ba798c16d0614d982a76755fdd72b37d437170':
  dsputil: remove unused functions copy_block{2, 4, 8, 16}.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-31 19:00:29 +01:00
Diego Biurrun
52acd79165 x86: hpel: Move {avg,put}_pixels16_sse2 to hpeldsp 2013-01-31 11:19:23 +01:00
Martin Storsjö
a65f965c04 mpegvideo: Do REBASE_PICTURE with byte pointers 
REBASE_PICTURE (more specifically, this half of it) takes a Picture
pointer that points into one larger struct, finds the offset of
that Picture within the struct and finds the corresponding field
within another instance of a similar struct.

The pointer difference "pic - (Picture*)old_ctx" is a value given
in sizeof(Picture) units, and when applied back on
(Picture*)new_ctx gets multiplied back with sizeof(Picture). Many
compilers seem to optimize out this division/multiplication, but
not all do.

GCC 4.2 on OS X doesn't seem to remove the division/multiplication,
therefore the new pointer didn't turn out to point to exactly
the right place in the new struct since it only had sizeof(Picture)
granularity (and the Picture is not aligned on a sizeof(Picture)
boundary within the encompassing struct). This bug has been present
before 47318953d as well - with H264, pointers to h->ref_list[0][0]
pointed to 88 bytes before h->ref_list[0][0] after the rebase. After
shrinking Picture, the difference ended up even larger, making
writes via such a Picture pointer overwrite other fields at random
in H264Context, ending up in crashes later.

This fixes H264 multithreaded decoding on OS X with GCC 4.2.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-31 10:51:36 +02:00
Michael Niedermayer
cdf0877bc3 h264/cabac: check loop index 
fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-31 04:21:26 +01:00
Mirjana Vulin
2b6a8187a6 mips: optimization for float aac decoder (core module) 
Signed-off-by: Mirjana Vulin <mvulin@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-31 01:23:09 +01:00
Michael Niedermayer
9df9420dea interplayvideo: Free previous frames on resolution changes. 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-31 00:46:04 +01:00
Piotr Bandurski
9c50e69385 loco: fix rgba on big-endian 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-31 00:02:17 +01:00
Michael Niedermayer
a084884b62 flashsv: clear blocks array on reallocation 
Fixes use of uninitialized data

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-30 23:50:32 +01:00
Michael Niedermayer
984add64a4 wma: check byte_offset_bits 
Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-30 23:12:57 +01:00
Michael Niedermayer
4a2da83a78 dnxhddec: fix integer overflow / index check 
Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-30 19:32:18 +01:00
Michael Niedermayer
b926cc7834 mss3: prevent AC state from becoming invalid in rac_normalise() 
Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-30 18:14:39 +01:00
Michael Niedermayer
d2e0a276d5 msrledec: merge switches 
More speedup and fixes 'may be used uninitialized in this function' warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-30 16:42:17 +01:00
Michael Niedermayer
dbaae33c2c msrledec: move loop into switch 
speeds up code and allows more simplifications

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-30 16:39:35 +01:00
Michael Niedermayer
c2992b7053 msrledec: move output pointer test up 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-30 16:33:45 +01:00
Michael Niedermayer
d8a7c4958e mpegvideo_enc: factor expression out 
Fixes "warning: dc[0..5] may be used uninitialized in this function"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-30 16:24:33 +01:00
Michael Niedermayer
afb4bc3d29 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  movenc: Simplify code by using avio_wb24
  bfin: unbreak compilation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-30 14:49:49 +01:00
Ronald S. Bultje
a5ba798c16 dsputil: remove unused functions copy_block{2, 4, 8, 16}. 2013-01-30 14:18:06 +01:00
Michael Niedermayer
71f8d70456 dirac/x86: fix compile without yasm 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-30 06:47:09 +01:00