RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
55,947 Commits 36 Branches 398 Tags 233 MiB
Commit Graph

25251 Commits

Author SHA1 Message Date
Michael Niedermayer 5cc8b81687 mpeg4videodec: fix GEOV/GEOX fliping 
Fixes Ticket317
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-24 01:04:23 +02:00
Michael Niedermayer 3941a4f5c2 snowenc: change a bunch of assert() to av_assert() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-24 01:00:00 +02:00
Paul B Mahol 2a75459519 pngdec: do not release buffer on failure instead report full progress 
Should fix heap-use-after-free as reported by Address Sanitizer.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-23 21:08:32 +00:00
Michael Niedermayer 9e477a3770 jpeg2000: fix null pointer dereference in case of malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-23 18:06:54 +02:00
Michael Niedermayer 09927f3eaa jpeg2000: zero reslevel array on allocation 
prevent use of uninitialized values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-23 18:06:54 +02:00
Michael Niedermayer 912ce9dd20 jpeg2000: fix dereferencing invalid pointers 
Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-23 17:36:53 +02:00
Diego Biurrun f407856968 arm: h264chroma: Do not compile h264_chroma_mc* dependent on h264 decoder 
The functions are used by all codecs that enable the h264chroma component
and the file is already compiled conditional on h264chroma being enabled.
 2013-08-23 17:21:14 +02:00
Diego Biurrun 84784c297f libfdk-aacdec: formatting cosmetics 2013-08-23 17:11:47 +02:00
Diego Biurrun 8506ff97c9 vp56: Mark VP6-only optimizations as such. 
Most of our VP56 optimizations are VP6-only and will stay that way.
So avoid compiling them for VP5-only builds.
 2013-08-23 14:42:19 +02:00
Paul B Mahol dd1d29bd5f pngdec: use av_fast_padded_malloc(z) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-23 10:29:33 +00:00
Michael Niedermayer 16a0d75c76 avcodec/mjpegdec: fix overread in find_marker() 
Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-23 04:44:55 +02:00
Carl Eugen Hoyos 2baa12f1d1 Fix dependencies for h263 vaapi decoder. 2013-08-23 02:11:49 +02:00
Michael Niedermayer 8bb11c3ca7 avcodec/jpeg2000dec: Check cdx/y values more carefully 
Some invalid values where not handled correctly in the later pixel
format matching code.
Fixes out of array accesses
Fixes Ticket2848

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-23 01:02:03 +02:00
Paul B Mahol 6e643239d9 pngdec: frame multithreading support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-22 13:14:25 +00:00
Michael Niedermayer f903b42663 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: Split DCT and FFT initialization into separate files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-22 14:28:42 +02:00
Michael Niedermayer 503aec1425 Merge commit '0b45269c2d732d15afa2de9c475d85fcf5561ac4' 
* commit '0b45269c2d732d15afa2de9c475d85fcf5561ac4':
  x86: h264_idct: Remove incorrect comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-22 13:04:07 +02:00
Michael Niedermayer 3819db745d avcodec/rpza: Perform pointer advance and checks before using the pointers 
Fixes out of array accesses
Fixes Ticket2850

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-22 01:26:02 +02:00
Paul B Mahol 920046abf1 loco: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-21 20:29:05 +00:00
Paul B Mahol 71c378984b qtrle: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-21 19:27:31 +00:00
Paul B Mahol 5c9d44d66b qtrle: use memcpy() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-21 19:18:05 +00:00
Paul B Mahol d5f547389b qtrle: use uint16_t and (u)int8_t instead of unsigned short and unsigned char 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-21 19:18:05 +00:00
Paul B Mahol 925d0837b9 qtrle: use bytestream2_get_buffer() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-21 19:18:05 +00:00
Paul B Mahol 9a5aa2c48e avcodec/mdec: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-21 18:35:58 +00:00
Diego Biurrun e7b31844f6 x86: Split DCT and FFT initialization into separate files 2013-08-21 20:15:27 +02:00
Thilo Borgmann ffa18de2e6 configure: Add exif to CONFIG_EXTRA. 
Add exif as a common component in CONFIG_EXTRA in order to avoid many
dependencies to 'exif.o tiff_common.o' in lavc/Makefile.
 2013-08-21 19:00:48 +02:00
Diego Biurrun 0b45269c2d x86: h264_idct: Remove incorrect comment 2013-08-21 15:09:58 +02:00
Michael Niedermayer 3d842cf827 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avcodec/utils: Simplify a condition that combines HAVE_NEON and ARCH_ARM

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-21 13:08:55 +02:00
Michael Niedermayer 70a73213b7 Merge commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1' 
* commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1':
  h264_ps: Use more meaningful error values

Conflicts:
	libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-21 13:03:40 +02:00
Michael Niedermayer e853cf5325 Merge commit '330ad1f6a53a37dec228cb424ca57e1268fafc64' 
* commit '330ad1f6a53a37dec228cb424ca57e1268fafc64':
  h264_ps: K&R formatting cosmetics

Conflicts:
	libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-21 12:56:37 +02:00
Michael Niedermayer 8299ed261a Merge commit '8fed466b0a7d636ae5035f9c6074fba9a621539b' 
* commit '8fed466b0a7d636ae5035f9c6074fba9a621539b':
  h264_ps: Drop commented-out cruft

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-21 12:32:33 +02:00
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: 186e47ef6d
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 bf36dc50ea, reversing
changes made to b7fc2693c7.

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: 12eb2fd539
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: ec3cd74f2d
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
Michael Niedermayer 1a01147d7a avcodec/ffv1enc: fix chroma_plane for rgb/rgba 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 13:27:29 +02:00
Michael Niedermayer c387c45e83 ffv1: fix plane_count at version 1.4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 13:03:53 +02:00
Michael Niedermayer 8ec6188263 ffv1dec: support printing information about the global header 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 12:58:48 +02:00
Janne Grunau e8c0defe13 8bps: decode 24bit files correctly as rgb32 on bigendian 2013-08-15 11:50:43 +02:00
Michael Niedermayer bfbe07670b wavpackenc: simplify "sign = ((sample) < 0) ? 1 : 0;" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 23:20:25 +02:00
Michael Niedermayer 1a53ddd9a2 avcodec/lzwenc: change asserts to av_asserts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 23:15:54 +02:00
Michael Niedermayer 796b20fa1c avcodec/gif: use the whole allocated buffer 
Fixes some gif encoding failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 23:15:54 +02:00
Michael Niedermayer b4e2e03709 avcodec/lzwenc: Add 1 additional bit of padding for gif 
This fixes issues with gimp reading animated gifs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 23:15:54 +02:00
Michael Niedermayer 5dd5985e05 avcodec/gif: move BITSTREAM_WRITER_LE up 
This prevents issues in case any header #includes put_bits.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 23:15:54 +02:00
Michael Niedermayer dabfa80ce2 avcodec/mjpegdec: print a message when there was just a single field and no frame 
Fixes ticket1915

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 19:16:38 +02:00
Paul B Mahol 93f4277714 WavPack encoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-14 14:04:05 +00:00
Michael Niedermayer 2bac839bd3 Merge commit 'f13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7' 
* commit 'f13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7':
  rtjpeg: Use init_get_bits8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 11:56:12 +02:00
Michael Niedermayer d12bc01ec5 Merge commit '62cc7a91080194d9ead162516f779f20931220d9' 
* commit '62cc7a91080194d9ead162516f779f20931220d9':
  rtjpeg: return meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 11:51:42 +02:00
Michael Niedermayer 8da4305eb5 Merge commit '2df0776c2293efb0ac12c003843ce19332342e01' 
* commit '2df0776c2293efb0ac12c003843ce19332342e01':
  nuv: Use av_fast_realloc

Conflicts:
	libavcodec/nuv.c

This change is not merged, the long ago fixed buffer use after codec_reinit()
was a bug.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 11:50:40 +02:00
Michael Niedermayer 1dee467d26 Merge commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6' 
* commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6':
  nuv: Reset the frame on resize

Conflicts:
	libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 10:44:55 +02:00
Michael Niedermayer 86fe16a763 Merge commit '075dbc185521f193c98b896cd63be3ec2613df5d' 
* commit '075dbc185521f193c98b896cd63be3ec2613df5d':
  nuv: Pad the lzo outbuf

Conflicts:
	libavcodec/nuv.c

See: 95e1dfee76
See: 266f6eefc6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 10:38:11 +02:00
Michael Niedermayer 7ec7d626a1 Merge commit 'aae159a7cc4df7d0521901022b778c9da251c24e' 
* commit 'aae159a7cc4df7d0521901022b778c9da251c24e':
  nuv: Do not ignore lzo decompression failures

Conflicts:
	libavcodec/nuv.c
	tests/ref/fate/nuv-rtjpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 10:10:14 +02:00
Piotr Bandurski 1ee1a3d9f4 avcodec/gsmdec: reject unsupported msn audio modes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-13 23:59:39 +02:00
Paul B Mahol 8a7295beeb tiff: frame multithreading support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-13 19:29:10 +00:00
Michael Niedermayer 9706401927 avcodec/mpeg12dec: check slice size before trying to decode it 
Fixes assertion failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-13 19:36:50 +02:00
Thilo Borgmann 6a64b23d93 Update my email address. 2013-08-13 15:45:08 +02:00
Michael Niedermayer cba9a40d47 avcodec: free priv_data in avcodec_copy_context() 
Fixes memleak
Fixes Ticket2216

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-13 15:24:30 +02:00
Michael Niedermayer ef36ba5e08 avcodec: clarify documentation of avcodec_copy_context() 
Following this is not strictly needed but safes some malloc+free

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-13 15:24:30 +02:00
Luca Barbato f13fe6020e rtjpeg: Use init_get_bits8 
CC:libav-stable@libav.org
 2013-08-13 14:04:55 +02:00
Luca Barbato 62cc7a9108 rtjpeg: return meaningful error codes 2013-08-13 14:04:55 +02:00
Luca Barbato 2df0776c22 nuv: Use av_fast_realloc 
The decompressed buffer can be used after codec_reinit, so it must be
preserved.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-08-13 14:04:06 +02:00
Luca Barbato feaaf5f7f0 nuv: Reset the frame on resize 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-08-13 13:09:33 +02:00
Luca Barbato 075dbc1855 nuv: Pad the lzo outbuf 
And properly update the buf_size with the correct size.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-08-13 13:09:33 +02:00
Luca Barbato aae159a7cc nuv: Do not ignore lzo decompression failures 
Update the fate reference since the last broken frame is not decoded
anymore.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-08-13 13:09:22 +02:00
Ian Taylor 46dee21a32 png: allow encoding 16-bit grayscale 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-08-13 06:05:44 +02:00
Thilo Borgmann bb4e1b4cf9 avcodec/mjpegdec: Read EXIF metadata in JPEG input. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-13 00:30:34 +02:00
Thilo Borgmann ad0f7574ef avcodec: Add EXIF metadata parser to libavcodec. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-13 00:30:20 +02:00
Thilo Borgmann b7ba7cbd6e avcodec/tiff: Refactor TIFF tag related functions to share the code. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-13 00:30:02 +02:00
Michael Niedermayer 5347de881b libavcodec/xsubenc.c: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer ad26aa3623 libavcodec/rv40.c: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer c6325e50dd libavcodec/mpegvideo.h: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer 1e6816dcda libavcodec/lpc.h: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer e458fd6cf9 libavcodec/dv.c: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer 805fbbefb3 libavcodec/bintext.h: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer c77c5f6c9f libavcodec/bink.c: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer 9da6e742f4 libavcodec/avcodec.h: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer f10462377d libavcodec/ac3tab.c: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer 7fabf3a4b7 libavcodec/ac3enc_template.c: Fix duplicate words 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 19:40:29 +02:00
Michael Niedermayer c103d5f538 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  wmall: use AVFrame API properly

Conflicts:
	libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 10:13:56 +02:00
Thilo Borgmann f18ccb529f Fix wrong use of "an" in some comments. 2013-08-12 03:27:26 +02:00
Michael Niedermayer 98fd8a7848 avcodec: Remove ff_packet_free_side_data, use av_packet_free_side_data 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-12 00:13:21 +02:00
Hendrik Leppkes 3ca5df36a5 wmall: use AVFrame API properly 
This fixes a bug with non-refcounted callers resulting in invalid memory access.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-11 21:13:56 +02:00
Reimar Döffinger d404fe35b2 Make new VDPAU easier to use by adding context to callback. 
Using VDPAU correctly means checking for preemption
and possibly regenerating the context all the time.
With the current API there is no context or other
user-defined pointer and thus this in not possible
during decoding unless using some hack like global
variables.
The need to reinitialize both surfaces and even function
pointers makes handling preemption even more difficult.
This patch introduces a new render2 function that gets
both the AVCodecContext and AVFrame in addition,
in both the user can store additional opaque data.
This allows even advanced approaches like keeping a
"generation counter" for the surfaces so they can be
regenerated on the fly and efficiently.
In addition, the function has a return value that will
be passed through all the way instead of being silently
ignored as for the current render function.
Unfortunately the HWAccel API has no way of providing
API/ABI compatibility, so a currently disallowed
state (render pointer being NULL) is used to extend it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-08-11 20:16:57 +02:00
Reimar Döffinger af05edc658 vdpau: Add an allocation function for AVVDPAUContext. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-08-11 19:31:46 +02:00
Reimar Döffinger d87f9da53c vdpau_internal.h: Add missing include for FF_API_BUFS_VDPAU. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-08-11 19:30:51 +02:00
Reimar Döffinger 49cf36f4e3 sanm: fix undefined behaviour on big-endian. 
A variable with post-increment may only appear
once in a statement.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-08-11 19:30:51 +02:00
Michael Niedermayer 61e0e80999 tiff: continue parsing on non fatal errors 
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 18:11:36 +02:00
Michael Niedermayer 8e119a22c4 mpeg4videodec: Parse newpred headers 
This is untested due to lack of a non broken file using new pred

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 17:35:30 +02:00
Michael Niedermayer 06137a496b mpeg4videodec: check resolution marker bits 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 17:34:29 +02:00
Michael Niedermayer b905a7137a avcodec/avpacket: Fix memory allocation failure check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 10:56:07 +02:00
Michael Niedermayer 67a580f423 Merge commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d' 
* commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d':
  lavc: Add refcounted api to AVPacket

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 10:45:13 +02:00
Michael Niedermayer 921c1d4c95 Merge commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e' 
* commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e':
  h264: check one context_init() allocation

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 10:35:44 +02:00
Michael Niedermayer d2d8e259fd Merge commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598' 
* commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598':
  h264: use explicit variable names for *_field_flag

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 10:28:49 +02:00
Michael Niedermayer 019eb2c77b svq3: Fix ff_h264_check_intra_pred_mode() return code check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 10:22:51 +02:00
Michael Niedermayer e0b45ca730 Merge commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714' 
* commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714':
  h264: return meaningful values

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-11 10:08:48 +02:00
Luca Barbato 5a9a9d4a2a lavc: Add refcounted api to AVPacket 
Provide a clean way to manipulate packets.
 2013-08-10 13:41:35 +02:00
Vittorio Giovara c1076d8479 h264: check one context_init() allocation 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-10 13:36:38 +02:00
Vittorio Giovara 5eb488bfa8 h264: use explicit variable names for *_field_flag 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-10 13:36:25 +02:00
Vittorio Giovara b3dc260e7f h264: return meaningful values 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-10 13:28:51 +02:00
Michael Niedermayer b37ff488b8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libavutil: Make avpriv_open a library-internal function on msvcrt

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-10 10:51:03 +02:00
Reimar Döffinger d4db7c334b Integrate accessors.h header into internal.h 
I have no idea why I added a separate header,
I think there is no good reason for it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-08-10 07:56:42 +02:00
Martin Storsjö e743e7ae6e libavutil: Make avpriv_open a library-internal function on msvcrt 
Add one copy of the function into each of the libraries, similarly
to what we do for log2_tab. When using static libs, only one
copy of the file_open.o object file gets included, while when
using shared libraries, each of them get a copy of its own.

This fixes DLL builds with a statically linked C runtime, where
each DLL effectively has got its own instance of the C runtime,
where file descriptors can't be shared across runtimes.

On systems not using msvcrt, the function is not duplicated.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-10 00:53:33 +03:00
Michael Niedermayer db8578a809 avcodec/raw: gbrp support 
Fixes 2nd half of Ticket2274

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-09 23:02:48 +02:00
Michael Niedermayer 200170e8c0 avcodec/tiff: remove redundant check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-09 14:58:07 +02:00
Michael Niedermayer a9553e8f37 avcodec/tiff: avoid seek back on reading tags 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-09 14:53:13 +02:00