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

25171 Commits

Author SHA1 Message Date
Michael Niedermayer
16466d92b9 Merge commit 'c4e43560fe6677e9d60bfb3cffc41c7324e92a0b' 
* commit 'c4e43560fe6677e9d60bfb3cffc41c7324e92a0b':
  h264data: Move some tables to the only place they are used

Conflicts:
	libavcodec/h264data.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-21 12:21:48 +02:00
Michael Niedermayer
e9cb43c6f6 Merge commit 'f34de1486aa0eb147d46ba5d2cb86a17407bb7ce' 
* commit 'f34de1486aa0eb147d46ba5d2cb86a17407bb7ce':
  h264data: Remove unused luma_dc_field_scan table

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-21 12:12:10 +02:00
Michael Niedermayer
614cf1a613 Merge commit '4f2b469da5e4ae221718ae479f6af627cfdebb91' 
* commit '4f2b469da5e4ae221718ae479f6af627cfdebb91':
  Add a libfdk-aac decoder

Conflicts:
	configure
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-21 12:05:19 +02:00
Michael Niedermayer
58e12732db Merge commit '2a61592573d725956a4377641344afe263382648' 
* commit '2a61592573d725956a4377641344afe263382648':
  avcodec: Remove some commented-out debug cruft

Conflicts:
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_mvpred.h
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-21 11:18:43 +02:00
Diego Biurrun
e95930eda1 avcodec/utils: Simplify a condition that combines HAVE_NEON and ARCH_ARM 2013-08-21 09:40:39 +02:00
Michael Niedermayer
880c73cd76 avcodec/flashsv: check diff_start/height 
Fixes out of array accesses
Fixes Ticket2844

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-20 23:18:48 +02:00
Diego Biurrun
c18838f5eb h264_ps: Use more meaningful error values 2013-08-20 21:24:42 +02:00
Diego Biurrun
330ad1f6a5 h264_ps: K&R formatting cosmetics 2013-08-20 21:23:24 +02:00
Diego Biurrun
8fed466b0a h264_ps: Drop commented-out cruft 2013-08-20 21:09:05 +02:00
Diego Biurrun
c4e43560fe h264data: Move some tables to the only place they are used 2013-08-20 20:49:37 +02:00
Diego Biurrun
f34de1486a h264data: Remove unused luma_dc_field_scan table 2013-08-20 20:49:37 +02:00
Martin Storsjö
4f2b469da5 Add a libfdk-aac decoder 
This can be useful for decoding AAC object types that are not supported
by the native AAC decoder, e.g. AAC-LD and AAC-ELD.
 2013-08-20 14:27:27 -04:00
Diego Biurrun
2a61592573 avcodec: Remove some commented-out debug cruft 2013-08-20 19:59:50 +02:00
Michael Niedermayer
d9b0b54a5f ffv1: rename minor to micro version 
the version is 1.3.4 which makes 4 micro and not minor

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-20 03:30:36 +02:00
Michael Niedermayer
68b63a3432 mpegvideo: Use picture_ptr instead of picture in ff_mpeg_draw_horiz_band() 
Fixes strides and issue with mplayer and mpeg2 field pictures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-20 00:19:21 +02:00
Michael Niedermayer
63c0e9077e avcodec/jpeg2000dec: fix near null pointer dereference 
Fixes Ticket2840

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-18 18:44:12 +02:00
Michael Niedermayer
7d776062f9 avcodec/error_resilience: Fix handling of matrox mpeg2 
Fixes Ticket2615

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-18 14:37:12 +02:00
Michael Niedermayer
70967a60df mpeg12dec: also print progressive seq and chroma format 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-18 13:55:57 +02:00
Michael Niedermayer
66722b4ba9 Merge commit 'c34a96a5ddfa390ce2a352eca79190766c9056d4' 
* commit 'c34a96a5ddfa390ce2a352eca79190766c9056d4':
  dxa: fix decoding of first I-frame by separating I/P-frame decoding

Conflicts:
	libavcodec/dxa.c

See: 186e47ef6d7d90bfd8b16e77cfa5e7aeb2a497c0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-18 12:00:17 +02:00
Paul B Mahol
02eb15a6c1 wavpackenc: do not copy samples if they are not available 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-17 22:25:49 +00:00
Michael Niedermayer
6e4b9b8a2f avcodec: fix compilation without vdpau 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 22:18:55 +02:00
Michael Niedermayer
a0c6c8e53e Revert "Merge commit of 'vdpau: remove old-style decoders'" 
This reverts commit bf36dc50ea448999c8f8c7a35f6139a7040f6275, reversing
changes made to b7fc2693c70fe72936e4ce124c802ac23857c476.

Conflicts:

	libavcodec/h264.c

Keeping support for the old VDPAU API has been requested by our VDPAU maintainer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 22:17:49 +02:00
Michael Niedermayer
0a141b0e49 avcodec/dxa: Support printing picture debug info 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 15:11:09 +02:00
Janne Grunau
c34a96a5dd dxa: fix decoding of first I-frame by separating I/P-frame decoding 
5ef7c84 broke decoding for the first keyframe due to an unnecessary
check for a reference frame.

CC: libav-stable@libav.org
 2013-08-17 12:55:26 +02:00
Michael Niedermayer
9640ea1da4 dxa: fix support of decoding all frames even in the absence of references 
The case where decoding should only happen for keyframes and afterwards
(CODEC_FLAG2_SHOW_ALL not set) does not fully work neither before nor
after this

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 11:48:22 +02:00
Michael Niedermayer
186e47ef6d dxa: only fail with an error about reference frames if the reference frame would be used 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 11:19:20 +02:00
Michael Niedermayer
7a342f97c4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dxa: Make sure the reference frame exists

See: 12eb2fd5394813a6119912b22f5dfc17b4a6b4a0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 11:19:03 +02:00
Michael Niedermayer
bd71071066 Merge commit 'c59967fa7cc5bc2fa06b36c17d2c207240c06b3e' 
* commit 'c59967fa7cc5bc2fa06b36c17d2c207240c06b3e':
  h261: check the mtype index

Conflicts:
	libavcodec/h261dec.c

The right half of the check is impossible to be true and thus replaced by
an assert()

See: ec3cd74f2dab8e3e8234ccb994132b23d3098585
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 10:35:51 +02:00
Michael Niedermayer
2c1a215ddb ffv1: update years in header 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 01:43:30 +02:00
Michael Niedermayer
c8d89be477 ffv1enc: propagate error code from write_extradata() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 01:43:30 +02:00
Michael Niedermayer
eeb3fb9e62 ffv1enc: check for malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-17 01:43:30 +02:00
Michael Niedermayer
29852ffc64 avcodec/dirac_dwt: Remove unused ff_spatial_idwt2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 16:07:29 +02:00
Luca Barbato
5ef7c84a93 dxa: Make sure the reference frame exists 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-08-16 14:56:56 +02:00
Luca Barbato
c59967fa7c h261: check the mtype index 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-08-16 14:56:49 +02:00
Michael Niedermayer
d7ed473d5c Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  altivec: perform an explicit unaligned load

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 14:21:40 +02:00
Michael Niedermayer
83386a1f62 Merge commit '239f55bf3c966782b781338df284f250393b9ed6' 
* commit '239f55bf3c966782b781338df284f250393b9ed6':
  vp56data: Move all data tables to the .c file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 13:37:10 +02:00
Michael Niedermayer
669ea5e102 Merge commit 'cb214707a6cb0d3272ec0261af6f1f5d8b7dabc7' 
* commit 'cb214707a6cb0d3272ec0261af6f1f5d8b7dabc7':
  vp56data: Move all shared enum/struct declarations to common header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 13:19:24 +02:00
Michael Niedermayer
dbcee7cc5c Merge commit '38f64c03301ac66d7b54b3e4bd2bf6454f9fb2d3' 
* commit '38f64c03301ac66d7b54b3e4bd2bf6454f9fb2d3':
  mpeg12decdata.h: Move all tables to the only place they are used

Conflicts:
	libavcodec/mpeg12decdata.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 13:13:58 +02:00
Michael Niedermayer
89f4812cda Merge commit 'ec6c1b1d832ec3261cc3faf93a18d7b2a84883c6' 
* commit 'ec6c1b1d832ec3261cc3faf93a18d7b2a84883c6':
  mpeg12decdata: Remove unused #define

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 13:08:12 +02:00
Michael Niedermayer
b7a025092f Merge commit 'c591d4575a6f97fbbe6145304b1ea960e8e81e14' 
* commit 'c591d4575a6f97fbbe6145304b1ea960e8e81e14':
  avcodec: Replace local extern declarations for tables with header #includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 13:01:44 +02:00
Michael Niedermayer
7372177a08 Merge commit '060ce0c697e261ca2792a7df30dfd1bae6900a4f' 
* commit '060ce0c697e261ca2792a7df30dfd1bae6900a4f':
  ivi_common: Make some tables only used within the file static

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 12:31:43 +02:00
Michael Niedermayer
15677e7239 Merge commit 'e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa' 
* commit 'e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa':
  8bps: decode 24bit files correctly as rgb32 on bigendian

Conflicts:
	libavcodec/8bps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 11:43:26 +02:00
Kostya Shishkov
f399e406af altivec: perform an explicit unaligned load 
Implicit vector loads on POWER7 hardware can use the VSX
instruction set instead of classic Altivec/VMX. Let's force
a VMX load in this case.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-16 10:08:47 +03:00
Diego Biurrun
239f55bf3c vp56data: Move all data tables to the .c file 2013-08-15 14:38:03 +02:00
Diego Biurrun
cb214707a6 vp56data: Move all shared enum/struct declarations to common header 2013-08-15 14:38:03 +02:00
Diego Biurrun
38f64c0330 mpeg12decdata.h: Move all tables to the only place they are used 2013-08-15 14:38:03 +02:00
Diego Biurrun
ec6c1b1d83 mpeg12decdata: Remove unused #define 2013-08-15 14:38:03 +02:00
Diego Biurrun
c591d4575a avcodec: Replace local extern declarations for tables with header #includes 2013-08-15 14:38:03 +02:00
Diego Biurrun
060ce0c697 ivi_common: Make some tables only used within the file static 2013-08-15 14:38:03 +02:00
Michael Niedermayer
23606f27f0 avcodec/ffv1enc: bump minor_version for the chroma_plane fix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 13:49:21 +02:00