virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity
47,105 Commits 37 Branches 400 Tags
Commit Graph

21576 Commits

Author SHA1 Message Date
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
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
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
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 d21b82fd3a72751a77dbeda3aa17a3af5e009565.

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