ffmpeg.git
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 18 Dec 2011 01:23:57 +0000 (02:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: link test programs with static libraries
  dct-test: remove unused variable cropTbl
  swscale: fix overflow in gray16 vertical scaling.
  get_bits: remove LAST_SKIP_CACHE macro
  swscale: fix integer overflows in RGB pixel writing.
  swscale: add endian conversion for RGB555 and RGB444 pixel formats
  swscale: fix overflows in output of RGB48 pixels.
  get_bits: remove strange/obsolete comments
  get_bits: whitespace (mostly) cosmetics
  swscale: add rgb565 endianess conversion
  get_bits: remove unnecessary #includes
  mp3dec: hack: fix decoding with safe bitstream reader
  fate: fix eatqi test
  adpcm: Check for channels to be a non-zero integer
  swscale: fix overflows in RGB rounding constants.
  get_bits: introduce safe bitreading to prevent overreads.

Conflicts:
libswscale/swscale.c
libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoget_bits: drop the a32 reader.
Michael Niedermayer [Sun, 18 Dec 2011 00:46:36 +0000 (01:46 +0100)]
get_bits: drop the a32 reader.
that way qatar maintains the code for me and i dont need to resolve conflicts.
If someone wants the a32 reader back, only thing you need to do is maintain
it, i would be happy to have it back, iam just not volunteering to maintain
it due to lack of time.

Based on: a1e98f198e9db4e5ddfc2f777014179d3d7bc4d2 by Mans Rullgard.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agov210dec: Fix warning: ‘val’ may be used uninitialized in this function [-Wuninitialized]
Michael Niedermayer [Sun, 18 Dec 2011 00:06:07 +0000 (01:06 +0100)]
v210dec: Fix warning: ‘val’ may be used uninitialized in this function [-Wuninitialized]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agov210enc: Fix warning: ‘val’ may be used uninitialized in this function [-Wuninitialized]
Michael Niedermayer [Sat, 17 Dec 2011 23:55:21 +0000 (00:55 +0100)]
v210enc: Fix  warning: ‘val’ may be used uninitialized in this function [-Wuninitialized]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotta: Fix several warning: initialization from incompatible pointer type [enabled...
Michael Niedermayer [Sat, 17 Dec 2011 23:39:48 +0000 (00:39 +0100)]
tta: Fix several warning: initialization from incompatible pointer type [enabled by default]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosunrast: Fix warning: comparison of unsigned expression < 0 is always false [-Wtype...
Michael Niedermayer [Sat, 17 Dec 2011 23:34:01 +0000 (00:34 +0100)]
sunrast: Fix warning: comparison of unsigned expression < 0 is always false [-Wtype-limits]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolagarith: rgb24 support
Michael Niedermayer [Sat, 17 Dec 2011 23:09:26 +0000 (00:09 +0100)]
lagarith: rgb24 support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavd/lavfi: fix incomplete comment
Stefano Sabatini [Sun, 18 Dec 2011 00:04:02 +0000 (01:04 +0100)]
lavd/lavfi: fix incomplete comment

7 years agolavd/lavfi: fix typo in error message
Stefano Sabatini [Sun, 18 Dec 2011 00:03:40 +0000 (01:03 +0100)]
lavd/lavfi: fix typo in error message

7 years agobuild: link test programs with static libraries
Mans Rullgard [Sat, 17 Dec 2011 15:05:24 +0000 (15:05 +0000)]
build: link test programs with static libraries

Many of the test programs directly access internal symbols not
exported from the shared libraries.  This allows tests to run
when configured with shared libraries.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agodct-test: remove unused variable cropTbl
Mans Rullgard [Sat, 17 Dec 2011 21:35:50 +0000 (21:35 +0000)]
dct-test: remove unused variable cropTbl

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoswscale: fix overflow in gray16 vertical scaling.
Ronald S. Bultje [Sat, 17 Dec 2011 19:56:40 +0000 (19:56 +0000)]
swscale: fix overflow in gray16 vertical scaling.

This fixes the same overflow as in the RGB48/16-bit YUV scaling;
some filters can overflow both negatively and positively (e.g.
spline/lanczos), so we bias a signed integer so it's "half signed"
and "half unsigned", and can cover overflows in both directions
while maintaining full 31-bit depth.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agomsvideo1enc: Check that dimensions are a multiple of 4.
Michael Niedermayer [Sat, 17 Dec 2011 22:08:46 +0000 (23:08 +0100)]
msvideo1enc: Check that dimensions are a multiple of 4.
Fixes Ticket784
Found by: ami_stuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosbgdec: replace EOVERFLOW with ENOMEM.
Nicolas George [Sat, 17 Dec 2011 21:43:34 +0000 (22:43 +0100)]
sbgdec: replace EOVERFLOW with ENOMEM.

This should fix track issue #781, regarding compilation with
i686-w64-mingw32-gcc.

7 years agoget_bits: remove LAST_SKIP_CACHE macro
Mans Rullgard [Sat, 17 Dec 2011 19:40:16 +0000 (19:40 +0000)]
get_bits: remove LAST_SKIP_CACHE macro

This macro is empty since the removal of the A32 bitstream reader.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agomotion_est: avoid generating motion vectors that point between widthxheight and mb_wi...
Michael Niedermayer [Sat, 17 Dec 2011 18:55:47 +0000 (19:55 +0100)]
motion_est: avoid generating motion vectors that point between widthxheight and mb_widthxmb_height.
No difference in PSNR or bitrate in the printed precission with the matrix lobby scene at 322x242

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: fix integer overflows in RGB pixel writing.
Mans Rullgard [Sat, 17 Dec 2011 18:45:46 +0000 (18:45 +0000)]
swscale: fix integer overflows in RGB pixel writing.

We're shifting individual components (8-bit, unsigned) left by 24,
so making them unsigned should give the same results without the
overflow.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoswscale: add endian conversion for RGB555 and RGB444 pixel formats
Janne Grunau [Fri, 16 Dec 2011 22:04:30 +0000 (23:04 +0100)]
swscale: add endian conversion for RGB555 and RGB444 pixel formats

Add a macro to shorten the if condition.

7 years agoswscale: fix overflows in output of RGB48 pixels.
Ronald S. Bultje [Fri, 16 Dec 2011 00:03:54 +0000 (00:03 +0000)]
swscale: fix overflows in output of RGB48 pixels.

For certain types of filters where the intermediate sum of coefficients
can go above the fixed-point equivalent of 1.0 in the middle of a filter,
the sum of a 31-bit calculation can overflow in both directions and can
thus not be represented in a 32-bit signed or unsigned integer. To work
around this, we subtract 0x40000000 from a signed integer base, so that
we're halfway signed/unsigned, which makes it fit even if it overflows.
After the filter finishes, we add the scaled bias back after a shift.

We use the same trick for 16-bit bpc YUV output routines.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoget_bits: remove strange/obsolete comments
Mans Rullgard [Sat, 17 Dec 2011 01:07:32 +0000 (01:07 +0000)]
get_bits: remove strange/obsolete comments

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoget_bits: whitespace (mostly) cosmetics
Mans Rullgard [Sat, 17 Dec 2011 01:05:35 +0000 (01:05 +0000)]
get_bits: whitespace (mostly) cosmetics

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoswscale: add rgb565 endianess conversion
Janne Grunau [Fri, 16 Dec 2011 18:38:53 +0000 (19:38 +0100)]
swscale: add rgb565 endianess conversion

7 years agoget_bits: remove unnecessary #includes
Mans Rullgard [Sat, 17 Dec 2011 00:30:59 +0000 (00:30 +0000)]
get_bits: remove unnecessary #includes

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agomp3dec: hack: fix decoding with safe bitstream reader
Mans Rullgard [Sat, 17 Dec 2011 16:19:24 +0000 (16:19 +0000)]
mp3dec: hack: fix decoding with safe bitstream reader

The buffer splicing relies on the bitstream reader over-reading
the end of the buffer as declared in init_get_bits(), although
more data is actually present.  Manually moving the bitstream
boundary after init_get_bits() allows this to work as expected.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agodoc: fix "reference to nonexistent node `Regression Tests'" warning.
Clément Bœsch [Sat, 17 Dec 2011 15:49:25 +0000 (16:49 +0100)]
doc: fix "reference to nonexistent node `Regression Tests'" warning.

7 years agofate: fix eatqi test
Mans Rullgard [Sat, 17 Dec 2011 15:48:19 +0000 (15:48 +0000)]
fate: fix eatqi test

The sample has an incomplete last frame.  Decoding it is pointless.
The garbage produced was changed by the bitstream reader now
protecting against over-reads.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agodoc: fix "Unknown command `fate'" warning.
Clément Bœsch [Sat, 17 Dec 2011 15:46:56 +0000 (16:46 +0100)]
doc: fix "Unknown command `fate'" warning.

7 years agoadpcm: Check for channels to be a non-zero integer
Shitiz Garg [Sat, 17 Dec 2011 14:05:59 +0000 (19:35 +0530)]
adpcm: Check for channels to be a non-zero integer

channels would be 0 sometimes and would cause floating point exception
Fixes bugzilla #124

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agoswscale: fix overflows in RGB rounding constants.
Ronald S. Bultje [Fri, 16 Dec 2011 00:03:57 +0000 (00:03 +0000)]
swscale: fix overflows in RGB rounding constants.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoget_bits: introduce safe bitreading to prevent overreads.
Ronald S. Bultje [Fri, 16 Dec 2011 21:42:04 +0000 (21:42 +0000)]
get_bits: introduce safe bitreading to prevent overreads.

When turned on, H264/CAVLC gets ~15% (CVPCMNL1_SVA_C.264) slower for
ultra-high-bitrate files, or ~2.5% (CVFI1_SVA_C.264) for lower-bitrate
files. Other codecs are affected to a lesser extent because they are
less optimized; e.g., VC-1 slows down by less than 1% (all on x86).
The patch generated 3 extra instructions (cmp, cmovae and mov) per
call to get_bits().

The performance penalty on ARM is within the error margin for most
files, up to 4% in extreme cases such as CVPCMNL1_SVA_C.264.

Based on work (for GCI) by Aneesh Dogra <lionaneesh@gmail.com>, and
inspired by patch in Chromium by Chris Evans <cevans@chromium.org>.

7 years agolavc: Check codec_ids against insertion/removial typos
Michael Niedermayer [Sat, 17 Dec 2011 05:09:13 +0000 (06:09 +0100)]
lavc: Check codec_ids against insertion/removial typos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil: check sampleformats enum, pict type enum and media type enum against insert...
Michael Niedermayer [Sat, 17 Dec 2011 04:45:34 +0000 (05:45 +0100)]
avutil: check sampleformats enum, pict type enum and media type enum against insert/remove mistakes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopixfmts: Selfcheck against insertions / deletions in the enum.
Michael Niedermayer [Sat, 17 Dec 2011 04:41:42 +0000 (05:41 +0100)]
pixfmts: Selfcheck against insertions / deletions in the enum.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaacdec: Fix null pointer crash
Michael Niedermayer [Sat, 17 Dec 2011 04:02:11 +0000 (05:02 +0100)]
aacdec: Fix null pointer crash
Fixes bug170
Bug found by: Gautam Gupta

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: fix init of topleft ref/mv.
Michael Niedermayer [Sat, 17 Dec 2011 03:42:04 +0000 (04:42 +0100)]
h264: fix init of topleft ref/mv.
Fixes Ticket778

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavienc: Fix rawvideo 32bit
Michael Niedermayer [Sat, 17 Dec 2011 02:25:46 +0000 (03:25 +0100)]
avienc: Fix rawvideo 32bit
Bug found by: Rik Maes <rik.maes54@gmail.com>
Change based on suggestion by Rik Maes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoatrac3: Fix crash in tonal component decoding.
Michael Niedermayer [Sat, 17 Dec 2011 02:18:58 +0000 (03:18 +0100)]
atrac3: Fix crash in tonal component decoding.
Fixes Ticket780
Bug Found by: cosminamironesei

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 17 Dec 2011 00:36:59 +0000 (01:36 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  get_bits: remove A32 variant
  avconv: support stream specifiers in -metadata and -map_metadata
  wavpack: Fix 32-bit clipping
  wavpack: Clip samples after shifting
  h264: don't drop B-frames after next keyframe on POC reset.
  get_bits: remove useless pointer casts
  configure: refactor lists of tests and components into variables
  rv40: NEON optimised weak loop filter
  mpegts: replace some magic numbers with the existing define
  swscale: add unscaled packed 16 bit per component endianess conversion

Conflicts:
libavcodec/get_bits.h
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoget_bits: remove A32 variant
Mans Rullgard [Fri, 16 Dec 2011 21:19:50 +0000 (21:19 +0000)]
get_bits: remove A32 variant

The A32 bitstream reader variant is only used on ARMv5 and for
Prores due to the larger bit cache this decoder requires.

In benchmarks on ARMv5 (Marvell Sheeva) with gcc 4.6, the only
statistically significant difference between ALT and A32 is
a 4% advantage for ALT in FLAC decoding.  There is thus no (longer)
any reason to keep the A32 reader from this point of view.

This patch adds an option to the ALT reader increasing the bit
cache to 32 bits as required by the Prores decoder.  Benchmarking
shows no significant change in speed on Intel i7.  Again, the
A32 reader fails to justify its existence.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoavconv: support stream specifiers in -metadata and -map_metadata
Alexandra Khirnova [Tue, 13 Dec 2011 10:23:06 +0000 (10:23 +0000)]
avconv: support stream specifiers in -metadata and -map_metadata

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agowavpack: Fix 32-bit clipping
Derek Buitenhuis [Fri, 16 Dec 2011 18:31:29 +0000 (13:31 -0500)]
wavpack: Fix 32-bit clipping

In the case that (frame_flags & 0x03) == 3, hybrid_maxclip
may have had a signed integer overflow.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agowavpack: Clip samples after shifting
Derek Buitenhuis [Fri, 16 Dec 2011 18:31:28 +0000 (13:31 -0500)]
wavpack: Clip samples after shifting

It doesn't make much sense to clip pre-shift,
nor is it correct for proper decoding.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoCODEC_ID_SOL_DPCM: Fix used write buffer.
Michael Niedermayer [Fri, 16 Dec 2011 19:34:34 +0000 (20:34 +0100)]
CODEC_ID_SOL_DPCM: Fix used write buffer.
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: don't drop B-frames after next keyframe on POC reset.
Ronald S. Bultje [Mon, 12 Dec 2011 20:02:58 +0000 (12:02 -0800)]
h264: don't drop B-frames after next keyframe on POC reset.

The keyframe after a POC reset may not be the first to be returned to
the user. Therefore, don't reset the expected next POC once we return
a keyframe to the user, but once we know that the next frame in the
return-queue is a keyframe.

7 years agocljr: Check if width or height are positive integers
Shitiz Garg [Thu, 15 Dec 2011 23:20:21 +0000 (04:50 +0530)]
cljr: Check if width or height are positive integers

width and height might get passed as 0 and would cause floating point
exceptions in decode_frame.
Fixes bugzilla #149

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: Fix killing [Y/n] prompt with ctrl-c
Michael Niedermayer [Fri, 16 Dec 2011 18:43:54 +0000 (19:43 +0100)]
ffmpeg: Fix killing [Y/n] prompt with ctrl-c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: exit() on repeated ctrl-c
Michael Niedermayer [Fri, 16 Dec 2011 18:37:32 +0000 (19:37 +0100)]
ffmpeg: exit() on repeated ctrl-c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: return the consumed amountg in case of Q264
Michael Niedermayer [Fri, 16 Dec 2011 17:55:52 +0000 (18:55 +0100)]
h264: return the consumed amountg in case of Q264

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: retuen the amount read in case of NAL_END_SEQUENCE
Michael Niedermayer [Fri, 16 Dec 2011 17:55:04 +0000 (18:55 +0100)]
h264: retuen the amount read in case of NAL_END_SEQUENCE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: reset nal_unit_type so that decoding frames without any nal units
Michael Niedermayer [Fri, 16 Dec 2011 17:52:56 +0000 (18:52 +0100)]
h264: reset nal_unit_type so that decoding frames without any nal units
dont leave its value at something random.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomtvdemuxer: fix segfault caused by truncated packets.
Michael Niedermayer [Fri, 16 Dec 2011 15:23:47 +0000 (16:23 +0100)]
mtvdemuxer: fix segfault caused by truncated packets.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: print an error if a packet has been truncated due to filesize
Michael Niedermayer [Fri, 16 Dec 2011 14:46:45 +0000 (15:46 +0100)]
lavf: print an error if a packet has been truncated due to filesize
in av_get_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotxd/westwood: remove demuxer specific overallocate solutions as the new generic code
Michael Niedermayer [Fri, 16 Dec 2011 14:44:29 +0000 (15:44 +0100)]
txd/westwood: remove demuxer specific overallocate solutions as the new generic code
handles it fine.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: Update AVIOContext.maxsize when hitting the end.
Michael Niedermayer [Fri, 16 Dec 2011 14:40:21 +0000 (15:40 +0100)]
lavf: Update AVIOContext.maxsize when hitting the end.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoget_bits: remove useless pointer casts
Mans Rullgard [Fri, 16 Dec 2011 15:10:42 +0000 (15:10 +0000)]
get_bits: remove useless pointer casts

These pointers are already of the correct type.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoconfigure: refactor lists of tests and components into variables
Diego Biurrun [Mon, 12 Sep 2011 15:52:44 +0000 (17:52 +0200)]
configure: refactor lists of tests and components into variables

7 years agorv40: NEON optimised weak loop filter
Mans Rullgard [Fri, 9 Dec 2011 21:21:26 +0000 (21:21 +0000)]
rv40: NEON optimised weak loop filter

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoRELEASE: We're now at 0.9.0.git
Dominique Leuenberger [Fri, 16 Dec 2011 13:05:29 +0000 (14:05 +0100)]
RELEASE: We're now at 0.9.0.git

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegts: replace some magic numbers with the existing define
Vladimir Pantelic [Fri, 16 Dec 2011 09:01:16 +0000 (10:01 +0100)]
mpegts: replace some magic numbers with the existing define

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoavidec: Check that the header chunks fit in the available filesize.
Michael Niedermayer [Fri, 16 Dec 2011 05:13:04 +0000 (06:13 +0100)]
avidec: Check that the header chunks fit in the available filesize.
Fixes Ticket771
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotxddemux: Limit allocated packets to filesize.
Michael Niedermayer [Fri, 16 Dec 2011 05:02:56 +0000 (06:02 +0100)]
txddemux: Limit allocated packets to filesize.
Fixes Ticket772
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agothp: simplify overallocate checks.
Michael Niedermayer [Fri, 16 Dec 2011 05:02:14 +0000 (06:02 +0100)]
thp: simplify overallocate checks.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: add internal AVIOContext.maxsize
Michael Niedermayer [Fri, 16 Dec 2011 04:54:03 +0000 (05:54 +0100)]
lavf: add internal AVIOContext.maxsize
This allows simple and generic limiting of allocations used for packets.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agothpdemux: Check that packed sizes are within the files data size and filesize.
Michael Niedermayer [Fri, 16 Dec 2011 04:35:04 +0000 (05:35 +0100)]
thpdemux: Check that packed sizes are within the files data size and filesize.
Fixes Ticket774
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavidec: Fix infinite loop caused by rounding of timestamps in non interleaved avis.
Michael Niedermayer [Fri, 16 Dec 2011 04:13:58 +0000 (05:13 +0100)]
avidec: Fix infinite loop caused by rounding of timestamps in non interleaved avis.
Fixes Ticket775
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: disable avconv again.
Michael Niedermayer [Fri, 16 Dec 2011 03:34:03 +0000 (04:34 +0100)]
configure: disable avconv again.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kdec: Fix integer overflow leading to a segfault
Michael Niedermayer [Fri, 16 Dec 2011 03:16:01 +0000 (04:16 +0100)]
j2kdec: Fix integer overflow leading to a segfault
Fixes Ticket776
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomovenc: disable iods by default
Michael Niedermayer [Fri, 16 Dec 2011 01:45:03 +0000 (02:45 +0100)]
movenc: disable iods by default

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Approved-by: MP4_maniac
Approved-by: Baptiste Coudurier
7 years agosmackerdemuxer: check some values before instead of just after malloc()
Michael Niedermayer [Fri, 16 Dec 2011 01:57:22 +0000 (02:57 +0100)]
smackerdemuxer: check some values before instead of just after malloc()
Fixes Ticket777
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowestwooddemux: dont require avio_size() functionality.
Michael Niedermayer [Fri, 16 Dec 2011 00:32:28 +0000 (01:32 +0100)]
westwooddemux: dont require avio_size() functionality.
Found by reimar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoExport ff_vdpau_vc1_decode_picture().
Carl Eugen Hoyos [Fri, 16 Dec 2011 01:33:25 +0000 (02:33 +0100)]
Export ff_vdpau_vc1_decode_picture().

XBMC's configure script checks for this function in installed
libavcodec.so to determine VDPAU support.

Fixes ticket #762 reported by Christian Marillat

7 years agoswscale: add unscaled packed 16 bit per component endianess conversion
Janne Grunau [Thu, 15 Dec 2011 23:44:26 +0000 (00:44 +0100)]
swscale: add unscaled packed 16 bit per component endianess conversion

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 16 Dec 2011 00:23:15 +0000 (01:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Rudimentary IODs support.
  v410enc: fix output buffer size check
  v410enc: include correct headers
  fate: add -pix_fmt rgb48le to r210 test
  flvenc: Support muxing 16 kHz nellymoser
  configure: refactor list of programs into a variable
  fate: add r210 decoder test
  fate: split off Indeo FATE tests into their own file
  fate: split off ATRAC FATE tests into their own file
  fate: Add FATE tests for v410 encoder and decoder
  ARM: fix external symbol refs in rv40 asm
  westwood: Make sure audio header info is present when parsing audio packets
  libgsm: Reset the MS mode of GSM in the flush function
  libgsm: Set options on the right object
  ARM: dca: disable optimised decode_blockcodes() for old gcc

Conflicts:
configure
libavformat/movenc.c
libavformat/movenc.h
tests/fate2.mak
tests/ref/acodec/alac
tests/ref/vsynth1/mpeg4
tests/ref/vsynth2/mpeg4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix typo in v210 decoder options.
Carl Eugen Hoyos [Fri, 16 Dec 2011 00:04:43 +0000 (01:04 +0100)]
Fix typo in v210 decoder options.

7 years agoffmpeg: check return code from av_vsrc_buffer_add_frame()
Michael Niedermayer [Thu, 15 Dec 2011 22:54:29 +0000 (23:54 +0100)]
ffmpeg: check return code from av_vsrc_buffer_add_frame()
Fixed Ticket770
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavd/lavfi: remove a duplicated line.
Nicolas George [Thu, 15 Dec 2011 18:55:35 +0000 (19:55 +0100)]
lavd/lavfi: remove a duplicated line.

7 years agomovenc: Rudimentary IODs support.
Alex Converse [Tue, 4 Oct 2011 18:44:25 +0000 (11:44 -0700)]
movenc: Rudimentary IODs support.

7 years agosmacker: Check for overread in smka_decode_frame()
Michael Niedermayer [Thu, 15 Dec 2011 21:45:57 +0000 (22:45 +0100)]
smacker: Check for overread in smka_decode_frame()
Fixes a segfault with wetlog_fail.smk
Bug found by: Shitiz Garg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavdevice: Fix v4l2 compilation under FreeBSD
Tom Evans [Thu, 15 Dec 2011 20:21:54 +0000 (20:21 +0000)]
libavdevice: Fix v4l2 compilation under FreeBSD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: update rfps debug code.
Michael Niedermayer [Thu, 15 Dec 2011 20:28:24 +0000 (21:28 +0100)]
lavf: update rfps debug code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: Fix fps misdetection when codec_info_duration is 0 and only a few frames are...
Michael Niedermayer [Thu, 15 Dec 2011 20:26:50 +0000 (21:26 +0100)]
lavf: Fix fps misdetection when codec_info_duration is 0 and only a few frames are used to estimate fps.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomov: Fix near infinite loop in stsd parsing.
Michael Niedermayer [Thu, 15 Dec 2011 19:51:00 +0000 (20:51 +0100)]
mov: Fix near infinite loop in stsd parsing.
Fixes Ticket768
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowestwooddemuxer: use av_get_packet()
Michael Niedermayer [Thu, 15 Dec 2011 19:27:51 +0000 (20:27 +0100)]
westwooddemuxer: use av_get_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowestwooddemuxer: Fix 1gb alloc
Michael Niedermayer [Thu, 15 Dec 2011 19:25:50 +0000 (20:25 +0100)]
westwooddemuxer: Fix 1gb alloc
Fixes Ticket765
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix linesize for bmp with bitdepth < 8.
Carl Eugen Hoyos [Thu, 15 Dec 2011 18:23:07 +0000 (19:23 +0100)]
Fix linesize for bmp with bitdepth < 8.

Fixes ticket #751.

7 years agov410enc: fix output buffer size check
Mans Rullgard [Thu, 15 Dec 2011 16:31:07 +0000 (16:31 +0000)]
v410enc: fix output buffer size check

The encoder clearly needs width * height * 4 bytes.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agov410enc: include correct headers
Mans Rullgard [Thu, 15 Dec 2011 16:06:12 +0000 (16:06 +0000)]
v410enc: include correct headers

This file does not use anything from put_bits.h but needs
intreadwrite.h.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agolavf: add SBG demuxer.
Nicolas George [Wed, 2 Nov 2011 15:30:27 +0000 (16:30 +0100)]
lavf: add SBG demuxer.

7 years agolavc: add ffwavesynth pseudo-codec.
Nicolas George [Wed, 2 Nov 2011 15:29:11 +0000 (16:29 +0100)]
lavc: add ffwavesynth pseudo-codec.

7 years agoarm: add back ldr_dpren macro that was lost.
Michael Niedermayer [Thu, 15 Dec 2011 16:24:43 +0000 (17:24 +0100)]
arm: add back ldr_dpren macro that was lost.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: fix midstream extardata handling with dump.f4v
Michael Niedermayer [Thu, 15 Dec 2011 16:23:39 +0000 (17:23 +0100)]
h264: fix midstream extardata handling with dump.f4v

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: add -pix_fmt rgb48le to r210 test
Janne Grunau [Thu, 15 Dec 2011 14:44:38 +0000 (15:44 +0100)]
fate: add -pix_fmt rgb48le to r210 test

Fixes checksum on big endian systems.

7 years agoflvenc: Support muxing 16 kHz nellymoser
Martin Storsjö [Thu, 15 Dec 2011 13:10:57 +0000 (15:10 +0200)]
flvenc: Support muxing 16 kHz nellymoser

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agojpegdec: check return value of mjpeg_decode_dc()
Michael Niedermayer [Thu, 15 Dec 2011 14:23:38 +0000 (15:23 +0100)]
jpegdec: check return value of mjpeg_decode_dc()
Fixes Ticket754

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: refactor list of programs into a variable
Diego Biurrun [Thu, 15 Dec 2011 11:17:13 +0000 (12:17 +0100)]
configure: refactor list of programs into a variable

7 years agofate: add r210 decoder test
Aneesh Dogra [Sun, 11 Dec 2011 04:45:38 +0000 (04:45 +0000)]
fate: add r210 decoder test

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years agoh264: Fix build with --disable-everything --enable-decoder='h264' --disable-optimizations
Michael Niedermayer [Thu, 15 Dec 2011 13:09:23 +0000 (14:09 +0100)]
h264: Fix build with --disable-everything --enable-decoder='h264' --disable-optimizations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: split off Indeo FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 21:48:20 +0000 (22:48 +0100)]
fate: split off Indeo FATE tests into their own file

7 years agofate: split off ATRAC FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 21:35:14 +0000 (22:35 +0100)]
fate: split off ATRAC FATE tests into their own file

7 years agofate: Add FATE tests for v410 encoder and decoder
Derek Buitenhuis [Tue, 13 Dec 2011 20:07:12 +0000 (15:07 -0500)]
fate: Add FATE tests for v410 encoder and decoder

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>