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

13832 Commits

Author SHA1 Message Date
Carl Eugen Hoyos d804784db5 Set channel layout for True Audio files. 
This is not documented (and possibly not originally intended),
but it's what the current reference decoder does.
 2011-04-29 10:46:45 +02:00
Carl Eugen Hoyos d2ee3c913d Fix channel layout for some stereo flac files. 2011-04-29 10:42:43 +02:00
Michael Niedermayer f0f3425311 flashsv2enc: mark encoder experimental 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-29 03:06:06 +02:00
Michael Niedermayer c83a528193 flashsv2enc: remove useless casts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-29 02:43:12 +02:00
Michael Niedermayer ba9c4db59a flashsv2enc: use av_freep() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-29 02:41:13 +02:00
Michael Niedermayer f6a5edb64c flashsv2enc: remove useless if() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-29 02:40:22 +02:00
Joshua Warner 3f6dc4a130 encoder for adobe's flash ScreenVideo2 codec 2011-04-29 02:35:59 +02:00
Michael Niedermayer 85ff339489 Revert "avparser: don't av_malloc(0)." 
This hack is no longer needed.

This reverts commit 191e08d113.
 2011-04-29 02:17:38 +02:00
ami_stuff 0fea3b7b80 Remove lowres support from cdgraphics decoder 
The lowres support doesn't work correctly (crops the video), so let's remove it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-29 01:29:19 +02:00
ami_stuff f27c72b368 Reduce max lowres from 5 to 3 in sp5x decoder 
lowres higher than 3 crashes ffmpeg/ffplay here

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-29 01:29:19 +02:00
ami_stuff e4f42f1f89 Remove lowres support from pnm decoder 
The lowres support doesn't work correctly (crops the video), so let's remove it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-29 01:29:19 +02:00
ami_stuff 658296e344 Remove lowres support from png decoder 
The lowres support doesn't work correctly (crops the video), so let's remove it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-29 01:29:19 +02:00
Niobos f3ce748d34 MJPEG encoder to write aspect ratio information 2011-04-28 20:39:49 +02:00
Michael Niedermayer a0db7424e4 Fix buffering in qpeg in a way that allows direct rendering. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-28 14:28:27 +02:00
Michael Niedermayer 90bcbc791f Revert "qpeg: use reget_buffer() in decode_frame()" 
This reverts commit f4e043ff63.
 2011-04-28 13:20:03 +02:00
Carl Eugen Hoyos b35a846923 Change silly variable name "class" to "partition_class". 2011-04-28 11:23:22 +02:00
Michael Niedermayer 0665199e43 Merge remote branch 'qatar/master' 
* qatar/master:
  vorbisdec: Rename silly "class_" variable to plain "class".
  simple_idct_alpha: Drop some useless casts.
  Simplify av_log_missing_feature().
  ac3enc: remove check for mismatching channels and channel_layout
  If AVCodecContext.channels is 0 and AVCodecContext.channel_layout is non-zero, set channels based on channel_layout.
  If AVCodecContext.channel_layout and AVCodecContext.channels are both non-zero, check to make sure they do not contradict eachother.
  cosmetics: indentation
  Check AVCodec.supported_samplerates and AVCodec.channel_layouts in avcodec_open().
  aacdec: remove sf_scale and sf_offset.
  aacdec: use a scale of 2 in the LTP MDCT rather than doubling the coefficient table values from the spec.
  Define POW_SF2_ZERO in aac.h and use for ff_aac_pow2sf_tabp[] offsets instead of hardcoding 200 everywhere.
  Large intensity stereo and PNS indices are legal. Clip them instead of erroring out. A magnitude of 100 corresponds to 2^25 so the will most likely result in clipped output anyway.
  qpeg: use reget_buffer() in decode_frame()
  ultimotion: use reget_buffer() in ulti_decode_frame()
  smacker: remove unnecessary call to avctx->release_buffer in decode_frame()
  avparser: don't av_malloc(0).

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-28 04:26:01 +02:00
Stefano Sabatini e5d80c7b2d mpeg12: terminate mpeg2_video_profiles arrays 
Make av_get_profile_name() return NULL if no profile is detected.

Fix trac issue #130, fix crash reading file tek3.m2v.
 2011-04-28 01:45:19 +02:00
Carl Eugen Hoyos 5a810f4e27 Return if memory allocation fails. 2011-04-28 00:09:46 +02:00
Baptiste Coudurier 045cc36fe7 100l, change #ifdef to #if 2011-04-27 14:24:36 -07:00
Baptiste Coudurier 46394d39e3 In png decoder, only call png_init_mmx if HAVE_MMX is defined. 2011-04-27 13:59:30 -07:00
Baptiste Coudurier dbfdb288c1 Set alpha of palettes to 0xff. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 21:49:45 +02:00
Baptiste Coudurier e91946ed23 Rename y400a to gray8a. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 21:36:30 +02:00
Michael Niedermayer 52a81cd0e4 Fix add_paeth_prediction_mmx for rgb48 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 20:08:37 +02:00
Michael Niedermayer afd2371d5c merge read and and in add_paeth_prediction 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 20:08:37 +02:00
Baptiste Coudurier 6d4c49a2af Move png mmx functions into x86/png_mmx.c, remove them from DSPContext. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 20:08:09 +02:00
Diego Biurrun b239526873 vorbisdec: Rename silly "class_" variable to plain "class". 2011-04-27 19:54:55 +02:00
Diego Biurrun 81afa5a274 simple_idct_alpha: Drop some useless casts. 2011-04-27 19:52:48 +02:00
Diego Biurrun 3fd3632ffe Simplify av_log_missing_feature(). 
Do not print the results of the conditional call to av_log_ask_for_sample()
into the same line as the main output, separate the already long text.
 2011-04-27 19:48:58 +02:00
Alexandre Colucci d6f910ea47 Fix decoding of DXSA subtitles. 
These have a DXSA tag and contain alpha in addition to
color values for palette.
 2011-04-27 19:45:57 +02:00
Justin Ruggles 8745e9c458 ac3enc: remove check for mismatching channels and channel_layout 2011-04-27 12:57:43 -04:00
Justin Ruggles 688b09fa59 If AVCodecContext.channels is 0 and AVCodecContext.channel_layout is 
non-zero, set channels based on channel_layout.

This allows the user to set only channel_layout and not channels.
 2011-04-27 12:57:43 -04:00
Justin Ruggles 168f9e8c40 If AVCodecContext.channel_layout and AVCodecContext.channels are both 
non-zero, check to make sure they do not contradict eachother.
 2011-04-27 12:57:43 -04:00
Justin Ruggles 3dfc3e70c0 cosmetics: indentation 2011-04-27 12:57:43 -04:00
Justin Ruggles 8b00ab0113 Check AVCodec.supported_samplerates and AVCodec.channel_layouts in 
avcodec_open().

If the encoder has a channel_layouts list and AVCodecContext.channel_layout
is 0, then only print a warning and let the encoder decide how to handle it.
 2011-04-27 12:57:42 -04:00
Alex Converse 767848d761 aacdec: remove sf_scale and sf_offset. 
Instead, scalefactors are adjusted by the offset amount, removing the need
for sf_scale, and the MDCT scales are adjusted to compensate for the higher
scalefactors. Floating-point output will be handled by modifying the MDCT
scales.
 2011-04-27 12:39:37 -04:00
Justin Ruggles 6271794041 aacdec: use a scale of 2 in the LTP MDCT rather than doubling the coefficient 
table values from the spec.
 2011-04-27 12:39:37 -04:00
Alex Converse d70fa4c423 Define POW_SF2_ZERO in aac.h and use for ff_aac_pow2sf_tabp[] offsets instead 
of hardcoding 200 everywhere.
 2011-04-27 12:39:37 -04:00
Alex Converse e4744b59aa Large intensity stereo and PNS indices are legal. Clip them instead of 
erroring out. A magnitude of 100 corresponds to 2^25 so the will most
likely result in clipped output anyway.

None of the conformance streams fall in the range that need to be clipped.
 2011-04-27 12:39:37 -04:00
Michael Niedermayer f08d171caa WMADEC: fix ticket125 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 17:12:14 +02:00
Stefano Sabatini f4e043ff63 qpeg: use reget_buffer() in decode_frame() 
Decoder relies on previous frame data, so use reget_buffer().

This also set frame->reference to 3, as the frame will be requested
unmodified later so it shouldn't be modified by the application.

Fix playback of file Clock.avi.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-04-27 07:44:40 -07:00
Stefano Sabatini 4f0b80599a ultimotion: use reget_buffer() in ulti_decode_frame() 
Decoder relies on previous frame data, so use reget_buffer().

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-04-27 07:42:42 -07:00
Stefano Sabatini 4f2954e232 smacker: remove unnecessary call to avctx->release_buffer in decode_frame() 
The release_buffer was cleaning the provided frame, thus causing the
successive call to avctx->reget_buffer() to allocate a new frame.  In
case the returned frame was not the same one previously returned but a
new one with different data, it resulted in artifacts.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-04-27 07:41:59 -07:00
Stefano Sabatini fd37eac495 indeo2: remove unnecessary release_buffer() call 
This was preventing reget_buffer() to return a buffer with the same
data, which was resulting in playback artifacts.

Fix trac issue #116.
 2011-04-27 11:50:45 +02:00
Stefano Sabatini 10aa5a6c42 4xm: use reget_buffer() in decode_frame() 
Also remove unnecessary call to avctx->release_buffer(). reget_buffer
is required since apparently the codec needs to be feeded with the
previous frame data.

Releasing the frame and using get_buffer was working only in the case
get_buffer() was returning the old frame data, and resulting in
playback artifacts otherwise.

Fix trac issue #85.
 2011-04-27 11:50:38 +02:00
Ronald S. Bultje 5eef4afb9a avparser: don't av_malloc(0). 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-04-26 22:07:17 -07:00
Ronald S. Bultje 191e08d113 avparser: don't av_malloc(0). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 04:20:55 +02:00
Michael Niedermayer 7b9e98173c Revert "Eliminate pointless '#if 1' statements without matching '#else'." 
no comment

This reverts commit e6ff064845.

Conflicts:

	libavcodec/dsputil.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 04:13:28 +02:00
Michael Niedermayer d7e5aebae7 Merge remote branch 'qatar/master' 
* qatar/master: (23 commits)
  ac3enc: correct the flipped sign in the ac3_fixed encoder
  Eliminate pointless '#if 1' statements without matching '#else'.
  Add AVX FFT implementation.
  Increase alignment of av_malloc() as needed by AVX ASM.
  Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
  documentation: extend documentation for ffmpeg -aspect option
  APIChanges: update commit hashes for recent additions.
  lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
  aac: add headers needed for log2f()
  lavc: remove FF_API_MB_Q cruft
  lavc: remove FF_API_RATE_EMU cruft
  lavc: remove FF_API_HURRY_UP cruft
  pad: make the filter parametric
  vsrc_movie: add key_frame and pict_type.
  vsrc_movie: fix leak in request_frame()
  lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
  vsrc_buffer: add sample_aspect_ratio fields to arguments.
  lavfi: add fieldorder filter
  scale: make the filter parametric
  ...

Conflicts:
	Changelog
	doc/filters.texi
	ffmpeg.c
	libavcodec/ac3dec.h
	libavcodec/dsputil.c
	libavfilter/avfilter.h
	libavfilter/vf_scale.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 03:51:04 +02:00
Justin Ruggles 79ee8977c2 ac3enc: correct the flipped sign in the ac3_fixed encoder 2011-04-26 17:19:37 -04:00