ffmpeg.git
7 years agovorbis_parser: fix blocksize
Michael Niedermayer [Fri, 4 May 2012 23:51:33 +0000 (01:51 +0200)]
vorbis_parser: fix blocksize

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggvorbis: move handling of first packets ts from parser to muxer.
Michael Niedermayer [Fri, 4 May 2012 23:41:54 +0000 (01:41 +0200)]
oggvorbis: move handling of first packets ts from parser to muxer.

The parser does not have enough knowledge it seems to do it
correctly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 4 May 2012 22:44:48 +0000 (00:44 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: add POWER[5-7] support
  arm: intreadwrite: revert 16-bit load asm to old version for gcc < 4.6
  vqavideo: return error if image size is not a multiple of block size
  cosmetics: indentation
  avformat: only fill-in interpolated timestamps if duration is non-zero
  avformat: remove a workaround for broken timestamps

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggtheora: Port changes from oggvorbis timestamp handling.
Michael Niedermayer [Fri, 4 May 2012 20:54:35 +0000 (22:54 +0200)]
oggtheora: Port changes from oggvorbis timestamp handling.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggvorbisdec: Apply timestamp calculation always when timestamps arent known.
Michael Niedermayer [Fri, 4 May 2012 20:45:57 +0000 (22:45 +0200)]
oggvorbisdec: Apply timestamp calculation always when timestamps arent known.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggvorbisdec: redesign special handling of first frames timestamp.
Michael Niedermayer [Fri, 4 May 2012 20:37:51 +0000 (22:37 +0200)]
oggvorbisdec: redesign special handling of first frames timestamp.

This also will make it possible to use the code for cases other than the start of a stream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexamples/filtering_audio: use av_buffersrc_add_frame.
Nicolas George [Sat, 28 Apr 2012 13:03:08 +0000 (15:03 +0200)]
examples/filtering_audio: use av_buffersrc_add_frame.

7 years agosrc_buffer: implement av_buffersrc_add_frame.
Nicolas George [Sat, 28 Apr 2012 13:01:41 +0000 (15:01 +0200)]
src_buffer: implement av_buffersrc_add_frame.

It supersedes av_vsrc_buffer_add_frame and handles
both audio and video.

7 years agosrc_buffer: implement audio buffer copy.
Nicolas George [Sat, 28 Apr 2012 12:54:04 +0000 (14:54 +0200)]
src_buffer: implement audio buffer copy.

7 years agolavfi/avcodec: implement audio copy_frame_prop.
Nicolas George [Sat, 28 Apr 2012 12:26:46 +0000 (14:26 +0200)]
lavfi/avcodec: implement audio copy_frame_prop.

7 years agolavfi: implement avfilter_get_audio_buffer_ref_from_frame.
Nicolas George [Sat, 28 Apr 2012 11:05:09 +0000 (13:05 +0200)]
lavfi: implement avfilter_get_audio_buffer_ref_from_frame.

7 years agoffmpeg: fix indent in term_init().
Clément Bœsch [Fri, 4 May 2012 17:21:31 +0000 (19:21 +0200)]
ffmpeg: fix indent in term_init().

7 years agoFix a few @file doxy inconsistencies.
Clément Bœsch [Fri, 4 May 2012 16:50:11 +0000 (18:50 +0200)]
Fix a few @file doxy inconsistencies.

7 years agoffmpeg: stronger ffpresets parsing.
Clément Bœsch [Thu, 3 May 2012 21:07:24 +0000 (23:07 +0200)]
ffmpeg: stronger ffpresets parsing.

This fixes at least issues with empty lines, and also allows CRLF lines
(in case a user makes its own preset on a MS plateform).

7 years agopresets: specify the codecs.
Clément Bœsch [Thu, 3 May 2012 20:01:32 +0000 (22:01 +0200)]
presets: specify the codecs.

This allows the following usages:
FFMPEG_DATADIR=presets ./ffmpeg -f lavfi -i testsrc=d=5 -vcodec libx264 -vpre ipod640 -f null -
FFMPEG_DATADIR=presets ./ffmpeg -f lavfi -i testsrc=d=5 -vpre libx264-ipod640 -f null -

The second example was broken even if documented.

7 years agoRemove old ffpresets.
Clément Bœsch [Mon, 26 Mar 2012 21:12:12 +0000 (23:12 +0200)]
Remove old ffpresets.

They are now replaced with presets/ directory. WIN32 still seems to use
a ffpresets/ directory, but it doesn't look like to be deployed at
install time.

7 years agopng_parser
Peter Holik [Thu, 3 May 2012 14:16:03 +0000 (00:16 +1000)]
png_parser

This adds support for png image2pipe streaming

Update to latest git by: Eugene Ware <eugene@noblesamurai.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggvorbis: Try to fix pts off by 1 issue.
Michael Niedermayer [Fri, 4 May 2012 13:44:11 +0000 (15:44 +0200)]
oggvorbis: Try to fix pts off by 1 issue.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: add POWER[5-7] support
Sean McGovern [Fri, 27 Apr 2012 13:47:58 +0000 (14:47 +0100)]
configure: add POWER[5-7] support

Also merge POWER3 and POWER4 configuration together with the additions.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agofate: update ogg seektest after all the bug fixes
Michael Niedermayer [Fri, 4 May 2012 12:38:46 +0000 (14:38 +0200)]
fate: update ogg seektest after all the bug fixes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggtheora: Fix initial pts
Michael Niedermayer [Fri, 4 May 2012 12:36:17 +0000 (14:36 +0200)]
oggtheora: Fix initial pts

code based on the solution in vorbis

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoseek-test: support printing multiple packets
Michael Niedermayer [Fri, 4 May 2012 12:27:44 +0000 (14:27 +0200)]
seek-test: support printing multiple packets

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggdec: fix off by one error on pos_limit
Michael Niedermayer [Fri, 4 May 2012 11:59:14 +0000 (13:59 +0200)]
oggdec: fix off by one error on pos_limit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggdec: print error on failure to create streams
Michael Niedermayer [Fri, 4 May 2012 11:53:57 +0000 (13:53 +0200)]
oggdec: print error on failure to create streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggdec: print error on changing streams when its unsupported.
Michael Niedermayer [Fri, 4 May 2012 11:53:34 +0000 (13:53 +0200)]
oggdec: print error on changing streams when its unsupported.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggdec: print error on unsupported versions
Michael Niedermayer [Fri, 4 May 2012 11:48:58 +0000 (13:48 +0200)]
oggdec: print error on unsupported versions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggdec: reset lastpts so that justins vorbis duration correction is not skiped
Michael Niedermayer [Fri, 4 May 2012 11:45:51 +0000 (13:45 +0200)]
oggdec: reset lastpts so that justins vorbis duration correction is not skiped

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggdec: pass avformat context to ogg_reset()
Michael Niedermayer [Fri, 4 May 2012 11:44:28 +0000 (13:44 +0200)]
oggdec: pass avformat context to ogg_reset()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoseek-test: support manually forcing a seek to a specific position
Michael Niedermayer [Fri, 4 May 2012 11:42:45 +0000 (13:42 +0200)]
seek-test: support manually forcing a seek to a specific position

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agozerocodec: check if there is previous frame
Paul B Mahol [Fri, 4 May 2012 10:24:39 +0000 (10:24 +0000)]
zerocodec: check if there is previous frame

Fixes crash in bug #1219.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoshorten: unsigned 8bit support
Paul B Mahol [Thu, 3 May 2012 10:29:21 +0000 (10:29 +0000)]
shorten: unsigned 8bit support

7 years agoarm: intreadwrite: revert 16-bit load asm to old version for gcc < 4.6
Mans Rullgard [Thu, 3 May 2012 18:14:16 +0000 (19:14 +0100)]
arm: intreadwrite: revert 16-bit load asm to old version for gcc < 4.6

Commit adebad0 "arm: intreadwrite: fix inline asm constraints for gcc
4.6 and later" caused some older gcc versions to miscompile code.
This reverts to the old version of the code for these compilers.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoMerge https://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder
Michael Niedermayer [Thu, 3 May 2012 20:39:29 +0000 (22:39 +0200)]
Merge https://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder

* https://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder:
  libopenjpegdec: respect JP2 color space, fix ticket 1179

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovqavideo: return error if image size is not a multiple of block size
Mans Rullgard [Mon, 23 Apr 2012 12:16:33 +0000 (13:16 +0100)]
vqavideo: return error if image size is not a multiple of block size

The decoder assumes in various places that the image size
is a multiple of the block size, and there is no obvious
way to support odd sizes.  Bailing out early if the header
specifies a bad size avoids various errors later on.

Fixes CVE-2012-0947.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agocosmetics: indentation
Justin Ruggles [Thu, 26 Apr 2012 15:07:41 +0000 (11:07 -0400)]
cosmetics: indentation

7 years agoavformat: only fill-in interpolated timestamps if duration is non-zero
Justin Ruggles [Thu, 26 Apr 2012 15:02:02 +0000 (11:02 -0400)]
avformat: only fill-in interpolated timestamps if duration is non-zero

This avoids returning duplicate timestamps for multiple packets when the
demuxer does not provide all timestamps and packet duration is not known.

7 years agoavformat: remove a workaround for broken timestamps
Justin Ruggles [Thu, 26 Apr 2012 14:59:05 +0000 (10:59 -0400)]
avformat: remove a workaround for broken timestamps

This modifies pts in situations other than what was intended, leading to
invalid timestamps.

Reverts commit 90bb394dccacd10607153833a0aeba0d970dc8db

7 years agolibopenjpegdec: respect JP2 color space, fix ticket 1179
Michael Bradshaw [Thu, 3 May 2012 18:27:04 +0000 (12:27 -0600)]
libopenjpegdec: respect JP2 color space, fix ticket 1179

Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 3 May 2012 19:02:32 +0000 (21:02 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpeg12: fixed parsing in some mpeg2 streams
  Add SMPTE240M transfer characteristics flag.
  mpegts: Some additional HDMV types and reg descriptors for mpegts
  motionpixels: Clip YUV values after applying a gradient.
  jpeg: handle progressive in second field of interlaced.
  ituh263dec: Implement enough of Annex O (scalability) to fix a FPE.
  h263: more strictly forbid frame size changes with frame-mt.
  h264: additional protection against unsupported size/bitdepth changes.
  tta: prevents overflows for 32bit integers in header.
  configure: remove malloc_aligned.
  vp8: update frame size changes on thread context switches.
  snowdsp: explicitily state instruction size.
  wmall: fix reconstructing audio with uncoded channels
  WMAL cosmetics: fix indentation
  gitignore: add Win32 library suffixes

Conflicts:
configure
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/ituh263dec.c
libavcodec/mjpegdec.c
libavcodec/wmalosslessdec.c
libavcodec/x86/snowdsp_mmx.c
libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/src_buffer: fix indent.
Clément Bœsch [Thu, 3 May 2012 18:02:00 +0000 (20:02 +0200)]
lavfi/src_buffer: fix indent.

7 years agoffmpeg: fix indent.
Clément Bœsch [Thu, 3 May 2012 18:01:23 +0000 (20:01 +0200)]
ffmpeg: fix indent.

7 years agosrc_buffer: merge av_asrc_buffer_add_audio_buffer_ref.
Nicolas George [Fri, 27 Apr 2012 22:16:20 +0000 (00:16 +0200)]
src_buffer: merge av_asrc_buffer_add_audio_buffer_ref.

Implement it using av_buffersrc_add_ref.

7 years agosrc_buffer: move audio format change check in a separate function.
Nicolas George [Fri, 27 Apr 2012 18:36:57 +0000 (20:36 +0200)]
src_buffer: move audio format change check in a separate function.

7 years agosrc_buffer: move buffer copy in a separate function.
Nicolas George [Fri, 27 Apr 2012 18:24:20 +0000 (20:24 +0200)]
src_buffer: move buffer copy in a separate function.

This will make merging with the audio part easier.

7 years agosrc_buffer: move format change check in a separate function.
Nicolas George [Fri, 27 Apr 2012 18:11:00 +0000 (20:11 +0200)]
src_buffer: move format change check in a separate function.

This will make merging the check with the audio part easier.

7 years agosrc_buffer: introduce av_buffersrc_add_ref().
Nicolas George [Fri, 27 Apr 2012 18:02:52 +0000 (20:02 +0200)]
src_buffer: introduce av_buffersrc_add_ref().

This function merges the features of
av_vsrc_buffer_add_video_buffer_ref() and
av_buffersrc_buffer().

7 years agodoc: fix API examples references.
Clément Bœsch [Thu, 3 May 2012 17:53:38 +0000 (19:53 +0200)]
doc: fix API examples references.

7 years agoJACOsub demuxer, decoder and muxer.
Clément Bœsch [Mon, 18 Apr 2011 15:40:51 +0000 (17:40 +0200)]
JACOsub demuxer, decoder and muxer.

7 years agoffplay: use AVFrame accessor.
Nicolas George [Sun, 29 Apr 2012 09:17:16 +0000 (11:17 +0200)]
ffplay: use AVFrame accessor.

7 years agoffmpeg: use AVFrame accessor.
Nicolas George [Sun, 29 Apr 2012 09:16:03 +0000 (11:16 +0200)]
ffmpeg: use AVFrame accessor.

7 years agolavc: implement accessors for some AVFrame fields.
Nicolas George [Sun, 29 Apr 2012 09:10:17 +0000 (11:10 +0200)]
lavc: implement accessors for some AVFrame fields.

Compared to av_opt_ptr, accessors bring:

- better performance (negligible);
- compile-time type check;
- link-time existence check
  (or at worst, a dynamic linker error instead of a NULL dereference).

7 years agompeg12: fixed parsing in some mpeg2 streams
Hendrik Leppkes [Sun, 29 Apr 2012 16:33:40 +0000 (16:33 +0000)]
mpeg12: fixed parsing in some mpeg2 streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agoAdd SMPTE240M transfer characteristics flag.
Hendrik Leppkes [Sun, 29 Apr 2012 16:33:34 +0000 (16:33 +0000)]
Add SMPTE240M transfer characteristics flag.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agompegts: Some additional HDMV types and reg descriptors for mpegts
Joakim Plate [Sun, 29 Apr 2012 16:33:32 +0000 (16:33 +0000)]
mpegts: Some additional HDMV types and reg descriptors for mpegts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agoswr: add ff_int32_to_float_a_avx
Michael Niedermayer [Thu, 3 May 2012 13:52:36 +0000 (15:52 +0200)]
swr: add ff_int32_to_float_a_avx

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test: fix rounding error leading to NAN
Michael Niedermayer [Thu, 3 May 2012 12:42:37 +0000 (14:42 +0200)]
swr-test: fix rounding error leading to NAN

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexamples/decoding_encoding: fix encoding when all frames got buffered.
Michael Niedermayer [Thu, 3 May 2012 10:25:17 +0000 (12:25 +0200)]
examples/decoding_encoding: fix encoding when all frames got buffered.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: consistently use '"' for quoting the drawtext arguments in examples
Stefano Sabatini [Thu, 3 May 2012 08:35:24 +0000 (10:35 +0200)]
doc/filters: consistently use '"' for quoting the drawtext arguments in examples

7 years agolavfi/drawtext: give a new alias "timecode_rate" to the the r/rate option
Stefano Sabatini [Tue, 1 May 2012 22:56:30 +0000 (00:56 +0200)]
lavfi/drawtext: give a new alias "timecode_rate" to the the r/rate option

The option is related to the timecode, the new name clearly specifies the
context. Also it allows to list the option close to the other timecode
options.

7 years agodoc/filters: document drawtext draw expression
Stefano Sabatini [Tue, 1 May 2012 11:26:05 +0000 (13:26 +0200)]
doc/filters: document drawtext draw expression

7 years agolavfi/drawtext: rename and document variables d_expr and d_pexpr
Stefano Sabatini [Tue, 1 May 2012 10:57:36 +0000 (12:57 +0200)]
lavfi/drawtext: rename and document variables d_expr and d_pexpr

Use the more expressive names draw_expr and draw_pexpr, also more
consistent.

7 years agodoc/filters: document rand() drawtext expression function
Stefano Sabatini [Tue, 1 May 2012 10:52:16 +0000 (12:52 +0200)]
doc/filters: document rand() drawtext expression function

7 years agodoc/filters: document x and y drawtext expression parameters
Stefano Sabatini [Tue, 1 May 2012 10:26:11 +0000 (12:26 +0200)]
doc/filters: document x and y drawtext expression parameters

7 years agodoc/filters: fix location of "rate" and "timecode" drawtext options
Stefano Sabatini [Tue, 1 May 2012 10:11:11 +0000 (12:11 +0200)]
doc/filters: fix location of "rate" and "timecode" drawtext options

They are options, not expression parameters.

7 years agolavfi/drawtext: alphabetically sort the expression parameters
Stefano Sabatini [Tue, 1 May 2012 09:37:15 +0000 (11:37 +0200)]
lavfi/drawtext: alphabetically sort the expression parameters

7 years agomotionpixels: Clip YUV values after applying a gradient.
Alex Converse [Wed, 2 May 2012 19:08:03 +0000 (12:08 -0700)]
motionpixels: Clip YUV values after applying a gradient.

Prevents illegal reads on truncated and malformed input.

CC: libav-stable@libav.org
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 2 May 2012 19:12:34 +0000 (21:12 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: intreadwrite: disable inline asm for gcc 4.7 and later
  arm: intreadwrite: fix inline asm constraints for gcc 4.6 and later
  indeo3: fix motion vector validation
  pcm_bluray: set bits_per_raw_sample for > 16-bit
  twinvq: fix out of bounds array access
  lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type

Conflicts:
doc/APIchanges
libavcodec/indeo3.c
libavcodec/pcm-mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpeg: handle progressive in second field of interlaced.
Ronald S. Bultje [Wed, 14 Mar 2012 00:18:41 +0000 (17:18 -0700)]
jpeg: handle progressive in second field of interlaced.

Progressive data is allocated later in decode_sof(), not allocating
that data leads to NULL dereferences.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoituh263dec: Implement enough of Annex O (scalability) to fix a FPE.
Michael Niedermayer [Thu, 29 Mar 2012 23:54:28 +0000 (16:54 -0700)]
ituh263dec: Implement enough of Annex O (scalability) to fix a FPE.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoh263: more strictly forbid frame size changes with frame-mt.
Ronald S. Bultje [Thu, 29 Mar 2012 19:24:10 +0000 (12:24 -0700)]
h263: more strictly forbid frame size changes with frame-mt.

Prevents crashes because the old check was incomplete.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoh264: additional protection against unsupported size/bitdepth changes.
Ronald S. Bultje [Thu, 29 Mar 2012 23:37:09 +0000 (16:37 -0700)]
h264: additional protection against unsupported size/bitdepth changes.

Fixes crashes in codepaths not covered by original checks.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agotta: prevents overflows for 32bit integers in header.
Ronald S. Bultje [Thu, 29 Mar 2012 19:44:55 +0000 (12:44 -0700)]
tta: prevents overflows for 32bit integers in header.

This prevents sample_rate/data_length from going negative, which
caused various crashes and undefined behaviour further down.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoconfigure: remove malloc_aligned.
Ronald S. Bultje [Sun, 29 Apr 2012 17:40:37 +0000 (10:40 -0700)]
configure: remove malloc_aligned.

It was to signal that allocations are 16-byte aligned, but AVX requires
32-byte alignment, thus the check is no longer useful (and causes
crashes).

7 years agovp8: update frame size changes on thread context switches.
Ronald S. Bultje [Tue, 1 May 2012 16:59:04 +0000 (09:59 -0700)]
vp8: update frame size changes on thread context switches.

This properly synchronizes frame size changes between threads if
subsequent threads abort decoding before frame size is initialized, i.e.
it prevents the thread after that from ping-ponging back to the original
value.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
7 years agosnowdsp: explicitily state instruction size.
Ronald S. Bultje [Wed, 2 May 2012 16:55:46 +0000 (09:55 -0700)]
snowdsp: explicitily state instruction size.

Fixes a compile error with clang at -O0.

7 years agowmall: fix reconstructing audio with uncoded channels
Kostya Shishkov [Tue, 1 May 2012 14:09:51 +0000 (16:09 +0200)]
wmall: fix reconstructing audio with uncoded channels

7 years agoWMAL cosmetics: fix indentation
Mashiat Sarker Shakkhar [Wed, 2 May 2012 15:43:36 +0000 (08:43 -0700)]
WMAL cosmetics: fix indentation

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
7 years agogitignore: add Win32 library suffixes
Joakim Plate [Sun, 29 Apr 2012 16:33:28 +0000 (16:33 +0000)]
gitignore: add Win32 library suffixes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agoarm: intreadwrite: disable inline asm for gcc 4.7 and later
Mans Rullgard [Wed, 2 May 2012 14:09:54 +0000 (15:09 +0100)]
arm: intreadwrite: disable inline asm for gcc 4.7 and later

Starting with version 4.7, gcc properly supports unaligned
memory accesses on ARM.  Not using the inline asm with these
compilers results in better code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoarm: intreadwrite: fix inline asm constraints for gcc 4.6 and later
Mans Rullgard [Wed, 2 May 2012 11:46:22 +0000 (12:46 +0100)]
arm: intreadwrite: fix inline asm constraints for gcc 4.6 and later

With a dereferenced type-cast pointer as memory operand, gcc 4.6
and later will sometimes copy the data to a temporary location,
the address of which is used as the operand value, if it thinks
the target address might be misaligned.  Using a pointer to a
packed struct type instead does the right thing.

The 16-bit case is special since the ldrh instruction addressing
modes are limited compared to ldr.  The "Uq" constraint produces a
memory reference suitable for an ldrsb instruction, which supports
the same addressing modes as ldrh.  However, the restrictions appear
to apply only when the operand addresses a single byte.  The memory
reference must thus be split into two operands each targeting one
byte.  Finally, the "Uq" constraint is only available in ARM mode.
The Thumb-2 ldrh instruction supports most addressing modes so the
normal "m" constraint can be used there.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agolavfi: remove screenshot libmpcodecs wrapper
Paul B Mahol [Sun, 25 Mar 2012 11:12:04 +0000 (11:12 +0000)]
lavfi: remove screenshot libmpcodecs wrapper

The filter is useless.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: preserve NULL ptrs in get_buffer()
Michael Niedermayer [Wed, 2 May 2012 08:45:21 +0000 (10:45 +0200)]
ffmpeg: preserve NULL ptrs in get_buffer()

Fixes Ticket1260, Ticket1267

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoDon't restrict reverse decorrelation to both coded channels. It is also used for...
Jakub Stachowski [Tue, 1 May 2012 22:33:17 +0000 (00:33 +0200)]
Don't restrict reverse decorrelation to both coded channels. It is also used for mono data.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo3: fix motion vector validation
Hendrik Leppkes [Sun, 29 Apr 2012 16:33:41 +0000 (16:33 +0000)]
indeo3: fix motion vector validation

The index of the motion vector has to be checked before being
multiplied by 2 for the array index.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agopcm_bluray: set bits_per_raw_sample for > 16-bit
Hendrik Leppkes [Sun, 29 Apr 2012 17:21:55 +0000 (17:21 +0000)]
pcm_bluray: set bits_per_raw_sample for > 16-bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agofate: update mmf seek checksum, change caused by av_get_packet() useage
Michael Niedermayer [Tue, 1 May 2012 23:50:29 +0000 (01:50 +0200)]
fate: update mmf seek checksum, change caused by av_get_packet() useage

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: automatically choose s16/flt/dbl to preserve input precision unless user overrides.
Michael Niedermayer [Tue, 1 May 2012 22:51:06 +0000 (00:51 +0200)]
swr: automatically choose s16/flt/dbl to preserve input precision unless user overrides.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: add double precision support to the rematrix code
Michael Niedermayer [Tue, 1 May 2012 22:50:00 +0000 (00:50 +0200)]
swr: add double precision support to the rematrix code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: update double precision checks for our resampler
Michael Niedermayer [Tue, 1 May 2012 22:48:44 +0000 (00:48 +0200)]
swr: update double precision checks for our resampler

It supports double precision since a while

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: add lfe_mix_level
Justin Ruggles [Tue, 1 May 2012 22:25:57 +0000 (00:25 +0200)]
swr: add lfe_mix_level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: update side to back mixing.
Justin Ruggles [Tue, 1 May 2012 22:16:04 +0000 (00:16 +0200)]
swr: update side to back mixing.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAPIChanges: add entry for libavresample
Michael Niedermayer [Tue, 1 May 2012 20:17:47 +0000 (22:17 +0200)]
APIChanges: add entry for libavresample

Appears this was forgotten

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoxbmdec: fix decoding when variable name contains an 'x'.
Reimar Döffinger [Sun, 29 Apr 2012 13:56:12 +0000 (15:56 +0200)]
xbmdec: fix decoding when variable name contains an 'x'.

Fixes trac ticket #1142.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoxbmdec: print more details on decode error.
Reimar Döffinger [Sun, 29 Apr 2012 13:37:00 +0000 (15:37 +0200)]
xbmdec: print more details on decode error.

Makes debugging issues easier.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoflvdec: pass on proper error value.
Reimar Döffinger [Tue, 1 May 2012 18:00:30 +0000 (20:00 +0200)]
flvdec: pass on proper error value.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoRemove some useless code that duplicates av_get_packet.
Reimar Döffinger [Tue, 1 May 2012 17:59:29 +0000 (19:59 +0200)]
Remove some useless code that duplicates av_get_packet.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoMark truncated packets as corrupt in av_get_packet.
Reimar Döffinger [Mon, 30 Apr 2012 20:58:27 +0000 (22:58 +0200)]
Mark truncated packets as corrupt in av_get_packet.

Manually remove that flag again for formats that read an arbitrary
amount of data and thus truncation is not an error.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 1 May 2012 20:06:55 +0000 (22:06 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avplay: use libavresample for sample format conversion and channel mixing
  Fix compilation with YASM/NASM without AVX support.
  WMAL: do not output last frame again if nothing was decoded in current packet
  WMAL: do not start decoding if frame does not end in current packet
  adpcm-thp: fix invalid array indexing
  ppc: add const where needed in scalarproduct_int16_altivec()
  ppc: remove shift parameter from scalarproduct_int16_altivec()
  ppc: dsputil: do unaligned block accesses correctly
  dvenc: do not call dsputil functions with stride not a multiple of 16
  APIchanges: fill in some dates and commit hashes

Conflicts:
doc/APIchanges
ffplay.c
libavcodec/adpcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotwinvq: fix out of bounds array access
Mans Rullgard [Tue, 1 May 2012 17:27:19 +0000 (18:27 +0100)]
twinvq: fix out of bounds array access

ModeTab.fmode has only 3 elements, so indexing it with ftype
in the initialier for 'size' is invalid when ftype == FT_PPC.

This fixes crashes with gcc 4.8.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoswr: add and use function pointers for rematrix
Michael Niedermayer [Tue, 1 May 2012 18:20:21 +0000 (20:20 +0200)]
swr: add and use function pointers for rematrix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>