videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-08-23 18:01:50 +02:00
Code Releases Activity
47,483 Commits 36 Branches 398 Tags 234 MiB
b023392f34
Commit Graph

21686 Commits

Author SHA1 Message Date
Michael Niedermayer
89d5262289 mpeg4videodec: use ROUNDED_DIV for pts calculation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 21:08:57 +01:00
Paul B Mahol
67be7fb432 adpcm: thp, afc: support multichannel decoding 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-26 19:52:40 +00:00
Sergio Garcia Murillo
ec51b3308e h264: Fix minor bug in h264.c error trace 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 17:38:35 +01:00
Justin Ruggles
284ea790d8 dsputil: move vector_fmul_scalar() to AVFloatDSPContext in libavutil 2012-11-26 11:29:06 -05:00
Michael Niedermayer
1e27655388 aacenc: use the correct output buffer 
This fixes segfault caused by 3d3cf6745e
when SingleChannelElement.ret was renamed to SingleChannelElement.ret_buf.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-11-26 11:17:17 -05:00
Michael Niedermayer
a3f30f2e99 Merge commit '5ae72f54532960cb9eae82a1c9e8d505106c022b' 
* commit '5ae72f54532960cb9eae82a1c9e8d505106c022b':
  flashsv: check for keyframe before using differential coding
  h264: enable low delay only if no delayed frames were seen
  x86: fix build without inline asm

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 16:11:02 +01:00
Michael Niedermayer
59b68ee887 Merge commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa' 
* commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa':
  aacdec: use float planar sample format for output

Conflicts:
	libavcodec/aacdec.c
	libavcodec/aacsbr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 15:15:02 +01:00
Mans Rullgard
edd80ec7e3 aacdec: fix signed overflows in lcg_random() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-11-26 13:34:58 +00:00
Michael Niedermayer
a13148f633 Merge commit '8e134e5104e99a69cd4cea10540a7ce9c3682a2c' 
* commit '8e134e5104e99a69cd4cea10540a7ce9c3682a2c':
  lavc: clarify get_buffer() documentation
  mpegaudiodec: use planar sample format for output unless packed is requested
  x86: h264 qpel: use the correct number of utilized xmm regs in cglobal

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 14:24:19 +01:00
Michael Niedermayer
86270236d5 dsputil_mmx: ff_put_dirac_pixels depend now on yasm. 
Fix compile failure without yasm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 13:59:41 +01:00
Peter Ross
f737e76026 iff decoder: reindent 
Signed-off-by: Peter Ross <pross@xvid.org>
 2012-11-26 23:29:02 +11:00
Peter Ross
929a24efff iff decoder: merge iff ilbm and byterun1 decoders 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
 2012-11-26 23:29:02 +11:00
Peter Ross
f2dc82b90f dpx: perform width/height upgrade and av_image_check_size earlier to prevent segfault on malformed input 
Signed-off-by: Peter Ross <pross@xvid.org>
 2012-11-26 12:11:08 +00:00
Paul B Mahol
5a3370816f av_get_audio_frame_duration: add ADPCM_AFC 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-26 11:59:44 +00:00
Janne Grunau
5ae72f5453 flashsv: check for keyframe before using differential coding 
Fixes a segfault in te fuzzed sample resolutionchange.flv_s211713.

CC: libav-stable@libav.org
 2012-11-26 10:26:01 +01:00
Janne Grunau
706acb558a h264: enable low delay only if no delayed frames were seen 
Dropping frames is undesirable but that is the only way by which the
decoder could return to low delay mode. Instead emit a warning and
continue with delayed frames.
Fixes a crash in fuzzed sample nasa-8s2.ts_s20033 caused by a larger
than expected has_b_frames value. Low delay keeps getting re-enabled
from a presumely broken SPS.

CC: libav-stable@libav.org
 2012-11-26 10:25:39 +01:00
Michael Niedermayer
7b29b07394 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  remove #defines to prevent use of discouraged external functions
  x86: h264: Convert 8-bit QPEL inline assembly to YASM

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 02:17:02 +01:00
Diego Biurrun
7ee4071362 x86: fix build without inline asm 
The qpel functions referenced here are not related to h264 and should
thus never have been under CONFIG_H264QPEL.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-11-26 01:50:47 +01:00
Paul B Mahol
7d2156aee8 adpcm/thp: make use of ADPCMChannelStatus to store prev samples 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-26 00:44:45 +00:00
Justin Ruggles
3d3cf6745e aacdec: use float planar sample format for output 2012-11-25 19:06:36 -05:00
Justin Ruggles
8e134e5104 lavc: clarify get_buffer() documentation 
This is needed for the AAC decoder, which may need to call get_buffer()
more than once if the channel configuration changes.
 2012-11-25 19:06:36 -05:00
Justin Ruggles
3ffed68c2a mpegaudiodec: use planar sample format for output unless packed is requested 2012-11-25 19:05:58 -05:00
Michael Niedermayer
66c3bac2b9 Merge commit 'ad01ba6ceaea7d71c4b9887795523438689b5a96' 
* commit 'ad01ba6ceaea7d71c4b9887795523438689b5a96':
  x86: h264: Remove 3dnow QPEL code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 00:57:33 +01:00
Justin Ruggles
2d3993ce8c x86: h264 qpel: use the correct number of utilized xmm regs in cglobal 
Fixes xmm register clobbering on win64.
 2012-11-25 18:48:43 -05:00
Michael Niedermayer
bf2f93cdbf Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc' 
* commit '28c8e288fa0342fdef532a7522a4707bebf831cc':
  x86: h264_chromamc: port to cpuflags
  yop: fix typo
  avconv: fix copying per-stream metadata.
  doc: avtools-common-opts: Fix terminology concerning metric prefixes
  configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge
  riff: Make ff_riff_tags static and move under appropriate #ifdef

Conflicts:
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 00:43:45 +01:00
Stefano Sabatini
b473c9937e lavu/samplefmt: return the size of the allocated samples buffer at the next bump 
Make the functions av_samples_fill_arrays, av_samples_alloc, and
avcodec_fill_audio_frame return a buffer size rather than 0 in case of
success. This will be enabled at the next libavutil major bump, in order
to preserve backward compatibility.

Returning the size allows to simplify the code, avoiding a few function
calls.
 2012-11-25 23:23:24 +01:00
Carl Eugen Hoyos
d643dd5c55 Support switching field order when decoding frwu. 
The binary encoder has a "switch field order" setting that
moves one line from the top to the bottom of the frame.

Fixes ticket #966.
 2012-11-25 23:06:12 +01:00
Michael Niedermayer
b5b9686615 imc: flush decoder 
Fixes Ticket1899

Based on code by ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 22:48:18 +01:00
Michael Niedermayer
579d21f777 tga: check palette size earlier. 
Fixes Ticket1895

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 22:33:54 +01:00
Daniel Kang
610e00b359 x86: h264: Convert 8-bit QPEL inline assembly to YASM 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-11-25 20:38:35 +01:00
Stefano Sabatini
e55c3857d2 lavc/utils: check return value of avcodec_fill_audio_frame() for < 0 
Assume that the value is always negative in case of error, as stated in
the docs, do not assume that the value cannot be != 0 in case of success.
 2012-11-25 20:34:01 +01:00
Daniel Kang
ad01ba6cea x86: h264: Remove 3dnow QPEL code 
The only CPUs that have 3dnow and don't have mmxext are 12 years old.
Moreover, AMD has dropped 3dnow extensions from newer CPUs.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-11-25 20:32:55 +01:00
Peter Ross
33181975b5 mpsmpeg4: use av_image_check_size 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 18:38:12 +01:00
Peter Ross
a246a603bf avrndec: use av_image_check_size 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 18:38:12 +01:00
Peter Ross
2d954ccd84 rawdec: use av_image_check_size 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 18:38:12 +01:00
Diego Biurrun
28c8e288fa x86: h264_chromamc: port to cpuflags 2012-11-25 17:25:10 +01:00
Peter Ross
fdd71cf04c iff decoder: initialise HAM line decoder with first palette entry 
The palette is organised into 'hold' and 'modify' pairs, hence why
the first palette entry is pal[1].

Fixes ticket #1701.

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 14:40:36 +01:00
Michael Niedermayer
48cbdaea15 smacker: fix smacker_decode_header_tree() empty vlc table init 
Fixes Ticket1858

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 02:40:59 +01:00
Michael Niedermayer
807fa714f0 adpcmdec: Fix OOM/infloop 
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-24 19:29:03 +01:00
Michael Niedermayer
34b6f1efa2 libopencore_amrwb: check packet size 
Fix OOM

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-24 18:26:54 +01:00
Michael Niedermayer
57c0da6fe4 smacker: sanity check audio size. 
Fixes, excessive memory allocation
Fixes Ticket1892

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-24 18:02:08 +01:00
Michael Niedermayer
ed017ab945 atrac1: Check block align. 
Fixes OOM
Fixes second samples posted in Ticket1893

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-24 16:38:22 +01:00
Michael Niedermayer
5c392bac9a ra288: Check block align. 
Fixes OOM
Fixes Ticket1893

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-24 16:38:22 +01:00
Carl Eugen Hoyos
387f50606c Fix type of default value for v210 decoder option -custom_stride. 
Reviewed-by: Paul B Mahol
 2012-11-24 16:09:07 +01:00
Paul B Mahol
4995145f40 codec_desc: mark PCM A-law/mu-law lossy 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 11:19:27 +00:00
Paul B Mahol
2d62732b21 codec_desc: provide aliases for PCM A-law/mu-law 
Inspired by d21b82fd3a.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 11:14:06 +00:00
Paul B Mahol
3d8e684f05 ADPCM IMA Dialogic decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 10:56:47 +00:00
Paul B Mahol
ed591ed842 rl2: return meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 10:28:23 +00:00
Michael Niedermayer
f1470ca685 ratecontrol: Fix assertion failure on mismatching 2pass file. 
Fixes Ticket582

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-24 03:03:17 +01:00
Michael Niedermayer
0efcf16a3e replace av_log(0, by av_log(NULL, 
The first parameter is a pointer and NULL is more correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 18:10:02 +01:00
Michael Niedermayer
533a8b2a7d x86/mpegvideoenc_template: use av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 17:57:22 +01:00
Michael Niedermayer
8328df74f3 motion_est: use av_assert* instead of assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 16:40:53 +01:00
Michael Niedermayer
56540bb3b5 h263dec: switch 2 asserts to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 16:36:17 +01:00
Michael Niedermayer
5da885b84d dv: use av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 15:52:12 +01:00
Michael Niedermayer
25ca8aef54 Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da' 
* commit '4a606c830ae664013cea33800094d4d0f4ec62da':
  av_memcpy_backptr: optimise some special cases
  mpegvideo: simplify dxy calculation in hpel_motion()
  build: add rules to generate preprocessed source files

Conflicts:
	Makefile
	libavutil/mem.c
	library.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 13:30:51 +01:00
Mans Rullgard
5e39bb073a mpegvideo: simplify dxy calculation in hpel_motion() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-11-23 12:03:54 +00:00
Michael Niedermayer
0560b28f12 ffv1dec: remove incorrect assert() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 02:42:00 +01:00
Michael Niedermayer
2fc0cbd9a6 truemotion2: Fix av_log level and context 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 01:19:26 +01:00
Michael Niedermayer
801a2a1df0 mpeg12: fix av_log level and context 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 01:18:53 +01:00
Michael Niedermayer
42dde253ec dcadec: fix av_log level 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 01:18:31 +01:00
Carl Eugen Hoyos
dd6abc921a vqavideo: Reinitialise the actually used partial codebook bytestream-reader. 
Fixes ticket #1942.
 2012-11-22 22:28:17 +01:00
Paul B Mahol
32cd3a7c16 ADPCM AFC decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-22 19:27:44 +00:00
Michael Niedermayer
a9cfbf6d4b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  id3v2: fix reading unsynchronized frames.
  cdgraphics: fix incorrect vertical offset mask in cdg_scroll()
  apetag: fix error handling in ff_ape_parse_tag()

Conflicts:
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 15:36:50 +01:00
Michael Niedermayer
91743fb730 frwu: do not set interlacing flags. 
Our fate frwu sample is definitely not interlaced.
If someone has a interlaced frwu file, please contact us.

Without this change the field order patch would cause
incorrect interlacing information to be written when
using frwu input.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 05:21:38 +01:00
Michael Niedermayer
305a935968 brender: move declaration out of for() to make old compilers happy. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 01:07:16 +01:00
Aleksi Nurmi
492a5f835c brender_pix: a new image decoder 
PIX is an image file format that was used by the BRender 3d engine.

Signed-off-by: Aleksi Nurmi <aleksi.nurmi@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-22 01:06:25 +01:00
Peter Ross
bdba96e93c use correct doxygen parameter direction syntax 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:56:15 +01:00
Peter Ross
9ccc349f77 ensure comment blocks that contain doxygen commands start with double asterix 
Reveiwed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 23:55:15 +01:00
Michael Niedermayer
b93c933cd2 imgconvert-test: count the number of unused pixel format values. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 20:25:30 +01:00
Michael Niedermayer
fb1bb97d87 imgconvert-test: skip pix formats without name 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 20:25:30 +01:00
Michael Niedermayer
2c5d911166 imgconvert-test: test alpha flags 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 20:07:34 +01:00
Michael Niedermayer
c9ad2e9aa3 imgconvert: remove avg_bits_per_pixel(), its redundant 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 20:07:17 +01:00
Michael Niedermayer
60b59d657e codec_descriptors: fix typo in mpeg 2 video 
Found-by: Ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 18:25:01 +01:00
Michael Niedermayer
ea5adf7080 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  flashsv: Drop unused function and struct parameters
  pcm: fix decoding of pcm_s16le_planar on big-endian

Conflicts:
	libavcodec/pcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 18:12:13 +01:00
Michael Niedermayer
b044e81f06 Merge commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e' 
* commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e':
  imgconvert: remove PixFmtInfo

Conflicts:
	libavcodec/imgconvert.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 18:03:04 +01:00
Michael Niedermayer
6ff544e473 imgconvert: fix color type for non normal pix_fmts like HW stuff and unused entries. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 17:44:16 +01:00
Michael Niedermayer
6adf97fe00 avcodec_get_pix_fmt_loss: remove PixFmtInfo use 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 17:44:16 +01:00
Michael Niedermayer
fc04c99dea imgconvert: print color type too 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 17:44:16 +01:00
Michael Niedermayer
f6c4395374 imgconvert: remove PixFmtInfo use from avg_bits_per_pixel() 
This fixes several inconsistencies with YUV >8bit formats caused
due to missing information in the PixFmtInfo table.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 17:06:11 +01:00
Michael Niedermayer
0880f26bbe avcodec_find_best_pix_fmt_of_2: favor formats with fewer components if it does not incur a loss. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 17:06:11 +01:00
Michael Niedermayer
ad9333d5ef imgconvert-test: add avg bits per pixel 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 17:03:31 +01:00
Michael Niedermayer
0efa240f2b is_yuv_planar: remove use of PixFmtInfo 
This fixes the behavior for a few yuva 16bit formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 17:03:31 +01:00
Michael Niedermayer
be19e7e373 imgconvert: add self test code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 17:03:31 +01:00
Michael Niedermayer
494945cb66 Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480' 
* commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480':
  avcodec: split avpicture from imgconvert
  pixdesc: add PIX_FMT_ALPHA flag

Conflicts:
	libavcodec/imgconvert.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 15:37:01 +01:00
Xi Wang
0d3123666a cdgraphics: fix incorrect vertical offset mask in cdg_scroll() 
The vertical offset mask 0x07 is suspicious.

    v_off = FFMIN(data[2] & 0x07, CDG_BORDER_HEIGHT - 1);

Note that v_off is up to 11 (CDG_BORDER_HEIGHT - 1), the correct mask
should be 0x0F.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-11-21 14:35:26 +01:00
Diego Biurrun
17fecb4a59 flashsv: Drop unused function and struct parameters 2012-11-21 11:49:41 +01:00
Michael Niedermayer
391f323615 rc: fix 10l typo in rc_max_available_vbv_use calculation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 21:11:05 +01:00
Paul B Mahol
dd59f0125d add some planar PCM encoders 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-20 17:29:00 +00:00
Paul B Mahol
f17f759544 pcmdec: use memcpy() when possible for planar decoders 
This is faster (at least with clang).

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-20 17:28:36 +00:00
Justin Ruggles
00dd9a6d6a pcm: fix decoding of pcm_s16le_planar on big-endian 
The sample count is decremented by the DECODE() macro and needs to be reset
in each loop iteration. Also, DECODE() increments the src pointer so that does
not need to be done separately.
 2012-11-20 10:52:49 -05:00
Paul B Mahol
00e02366a5 pcmenc: use ENCODE macro for pcm_s8 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-20 13:18:56 +00:00
Michael Niedermayer
2d232f8b88 pcm: revert from libavs planar code to durandals. 
The libav code does not work on big endian.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 14:04:38 +01:00
Michael Niedermayer
70c0f13a9a Merge commit '7c278d2ae410a64bdd89f1777026b4b963c30a1a' 
* commit '7c278d2ae410a64bdd89f1777026b4b963c30a1a':
  alacenc: support 24-bit encoding
  pcmdec: use planar sample format for pcm_s16le_planar
  vorbisdec: use float planar sample format

Conflicts:
	libavcodec/pcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 13:34:27 +01:00
Luca Barbato
ae3822bca1 imgconvert: remove PixFmtInfo 
It is pleonastic and was used in stale functions pending replacement.
 2012-11-20 12:45:58 +01:00
Luca Barbato
d1d9efaae6 avcodec: split avpicture from imgconvert 
All the non deprecated functions are in avpicture.c now.
 2012-11-20 12:45:58 +01:00
Paul B Mahol
da8242e2d6 8svx: move pcm_s8_planar decoder to pcm.c 
Removes limitation of max 2 channels for pcm_s8_planar decoder by moving
it to more natural place.

AV_CODEC_ID_8SVX_RAW is not used by anything anymore and is going to be
removed.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-20 11:36:28 +00:00
Paul B Mahol
a5e382ad7f 4xm: return error code if decode_init() failed 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-20 09:42:32 +00:00
Justin Ruggles
7c278d2ae4 alacenc: support 24-bit encoding 2012-11-20 00:26:45 -05:00
Justin Ruggles
c9d0f4506f pcmdec: use planar sample format for pcm_s16le_planar 2012-11-19 23:48:37 -05:00
Justin Ruggles
79b7747556 vorbisdec: use float planar sample format 2012-11-19 23:48:37 -05:00
Michael Niedermayer
cf5f4c5169 aacsbr: check sample_rate before using it, fix division by 0 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 04:04:30 +01:00
Michael Niedermayer
aed128f07d 4xmdec: fix integer overflow, null ptr dereference 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 03:00:22 +01:00
Peter Ross
ed27ed9f4f iff: DEEP RLE 32-bit decoder 
Fixes ticket #1046.

Signed-off-by: Peter Ross <pross@xvid.org>
 2012-11-20 09:49:49 +11:00
Bojan Zivkovic
a74ae4691a mips: Optimization of AC3 FP encoder and EAC3 FP decoder 
Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reveiwed-by: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 22:24:44 +01:00
Michael Niedermayer
ebf4750200 pthreads: increase MAX_BUFFERS due to 24c043c98e 
This might fix a hypothetical memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 17:32:13 +01:00
Piotr Bandurski
1b20877f34 vble: remove superfluous braces 
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 15:36:20 +01:00
Michael Niedermayer
e6d81ce22e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: h264_intrapred: Fix C function names in comments
  x86: SPLATD: port to cpuflags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 14:24:20 +01:00
Michael Niedermayer
4116151a4b Merge commit '1c5805521c3e406886341d752ebf38f8d41e1d13' 
* commit '1c5805521c3e406886341d752ebf38f8d41e1d13':
  PGS subtitles: Set AVSubtitle pts value
  configure: Refactor CPPFLAGS settings for glibc/uclibc
  configure: add basic support for ARM AArch64
  build: set -U__STRICT_ANSI__ for newlib

Conflicts:
	configure
	libavcodec/pgssubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 14:05:41 +01:00
Michael Niedermayer
fdbb6164a2 sbr: increase f_tablelim size, it appears it was too small by 1. 
Prevent out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 13:09:02 +01:00
Michael Niedermayer
ba353436a3 h264: dont stop parsing NALs without cleanup on DPC. 
Fixes a deadlock with frame threads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 04:08:11 +01:00
Piotr Bandurski
45d8537ccf vble: do not abort when version is not 1 
Fixes ticket #1923.

Reviewed-by: Derek Buitenhuis
 2012-11-19 01:55:51 +01:00
Michael Niedermayer
24c043c98e mpegvideo: increase MAX_PICTURE_NUMBER. 
avoid abort().

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 01:38:06 +01:00
Piotr Bandurski
ade9960fc6 avrndec: support lowres for mjpeg 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 00:42:39 +01:00
Michael Niedermayer
e8fed4d331 error concealment: check that references are frames and not fields. 
frames cant have field references.
Fixes a deadlock

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 23:02:46 +01:00
Michael Niedermayer
8a03a60b4a h264: Check gray scale CBP, fix out of array accesses. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 23:02:46 +01:00
Paul B Mahol
0df7d95a5e pcmenc: remove dead increment 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-18 21:12:25 +00:00
Paul B Mahol
6557c46d91 pcm: move i into for loop to avoid { } inside switch statement 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-18 20:45:03 +00:00
Michael Niedermayer
36cf247e43 ff_h264_direct_ref_list_init: fix B slice check. 
Fixes null pointer dereference.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 19:10:57 +01:00
Paul B Mahol
9f02d4ed0f mjpegenc: yuvj444p support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-18 17:46:45 +00:00
Diego Biurrun
89923fce70 x86: h264_intrapred: Fix C function names in comments 
Function names changed after switching to declaration with
PRED4x4/8x8/8x8L/16x16 macros in the C code.
 2012-11-18 18:34:05 +01:00
John Stebbins
1c5805521c PGS subtitles: Set AVSubtitle pts value 
pts should be that of the packet containing the presentation segment.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-11-18 18:34:05 +01:00
Diego Biurrun
87af05c575 x86: SPLATD: port to cpuflags 2012-11-18 18:34:05 +01:00
Michael Niedermayer
d6c184880e h264: correct ref count check and limit, fix out of array accesses. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 16:47:29 +01:00
Michael Niedermayer
2d5f1addbe h264: fix integer overflow, assert failure 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 16:47:29 +01:00
Michael Niedermayer
1a947dfa83 ff_mpeg_update_thread_context: assert context unequality 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 16:47:29 +01:00
Piotr Bandurski
4413a8428a iff: decode HAM8 images with masking correctly. 
Fixes ticket #967.

Reviewed-by: Peter Ross
 2012-11-18 15:48:22 +01:00
Michael Niedermayer
4fecc3cf09 h264: Skip odd NALs in extradata, prevent undefined behavior 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 14:26:58 +01:00
Michael Niedermayer
dab19048a1 mjpegdec: reset h/v_count, fix assertion failure. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 06:00:44 +01:00
Paul B Mahol
e3edee6d2f eamad: return meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-17 20:28:52 +00:00
Michael Niedermayer
845724c82c vcr1: check if dimensions are supported, fix out of array accesses. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-17 20:43:56 +01:00
Paul B Mahol
9ba41ae63e PCM signed 16-bit big-endian planar decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-17 19:30:08 +00:00
Paul B Mahol
467dfd5dfa PCM signed 24-bit/32-bit little-endian planar decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-17 19:09:43 +00:00
Michael Niedermayer
63ac64864c eamad: fix out of array accesses 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-17 16:27:18 +01:00
Michael Niedermayer
8ad9b48c9b xxan: check ybuf index before use. 
Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-17 04:45:56 +01:00
Michael Niedermayer
774830050a cook: check subbands more completely, fix out of array read. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-17 03:43:17 +01:00
Michael Niedermayer
84281d111c ff_mpeg4videodec_static_init: fix return type 
Fixes CID743439
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-17 02:31:11 +01:00
Michael Niedermayer
31fce39942 tm2: check for invalid vlcs, fix out of array read 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-17 02:09:56 +01:00
Michael Niedermayer
6535d81d87 g723_1dec: Fix lsp2lpc() so it can handle values at the ends of the table. 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-16 21:36:44 +01:00
Michael Niedermayer
2207ea44fb ff_emulated_edge_mc: fix integer anomalies, fix out of array reads 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-16 21:33:52 +01:00
Michael Niedermayer
c2cbc80ae9 ffv1enc: consider 2pass float rounding, fix loop 
Found-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-16 17:01:13 +01:00
Michael Niedermayer
ff3b59c848 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: dsputil: port to cpuflags
  crc: av_crc() parameter names should match between .c, .h and doxygen
  avserver: replace av_read_packet with av_read_frame
  avserver: fix constness casting warnings

Conflicts:
	libavcodec/x86/dsputil.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-16 13:23:35 +01:00
Janne Grunau
e6160bda98 h264: Fix parameters to ff_er_add_slice() call 
s->mb_x is reset to zero a couple of lines above. It does not make
sense to call ff_er_add_slice() with 0 as endx when the end of the
macroblock row was reached. Fixes unnecessary and counterproductive
error resilience in https://bugzilla.libav.org/show_bug.cgi?id=394.

CC: libav-stable@libav.org
 2012-11-16 13:18:28 +01:00
Janne Grunau
60b6b8c019 h264: always check ref_count for validity 
Fixes a crash with zuffed files.
 2012-11-16 13:18:28 +01:00
Diego Biurrun
8c3849bc76 x86: dsputil: port to cpuflags 2012-11-16 10:38:23 +01:00
Michael Niedermayer
68def00a63 rv34: check image size before using it 
fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-16 05:16:34 +01:00
Michael Niedermayer
7845f8d282 vc1dec: do not allow field_mode to change after the first header 
Fixes out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-16 04:58:46 +01:00
Michael Niedermayer
e31b1938ac zmbv: avoid use of uninitialized data 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-15 20:58:36 +01:00
Michael Niedermayer
c2409a7c5b vmdav: more complete check for block_align, prevent out of array access. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-15 20:58:36 +01:00
Michael Niedermayer
ea3eaa37b1 flashsv: only realloc blocks for version 2 
Fixes 10l regression introducing a memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-15 20:58:35 +01:00
Paul B Mahol
eca2eb2dfa pcm: give more descriptive name to codec 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-15 16:04:35 +00:00