ffmpeg.git
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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.

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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
8 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>
8 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>
8 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

8 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

8 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>
8 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.

8 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>
8 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.

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

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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.

8 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>
8 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>
8 years agolavf: add SBG demuxer.
Nicolas George [Wed, 2 Nov 2011 15:30:27 +0000 (16:30 +0100)]
lavf: add SBG demuxer.

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

8 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>
8 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>
8 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.

8 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>
8 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>
8 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

8 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>
8 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>
8 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

8 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

8 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>
8 years agoARM: fix external symbol refs in rv40 asm
Mans Rullgard [Thu, 15 Dec 2011 11:02:46 +0000 (11:02 +0000)]
ARM: fix external symbol refs in rv40 asm

External symbol references need prefixes on some systems.
This should fix build errors on Darwin.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agowestwood: Make sure audio header info is present when parsing audio packets
Shitiz Garg [Thu, 15 Dec 2011 09:02:59 +0000 (14:32 +0530)]
westwood: Make sure audio header info is present when parsing audio packets

Audio header information might get scrambled and would not parse,
yet wsqva_read_packet would try to parse audio packets causing
segfaults such as floating point exception.

Fixes bugzilla #141.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibgsm: Reset the MS mode of GSM in the flush function
Martin Storsjö [Wed, 14 Dec 2011 20:32:29 +0000 (22:32 +0200)]
libgsm: Reset the MS mode of GSM in the flush function

The mode is set in libgsm_decode_init, but the decoder
object is simply destroyed and recreated in the flush
function - therefore the mode has to be set again.

This fixes playback using the libgsm_ms decoder in avplay.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibgsm: Set options on the right object
Martin Storsjö [Wed, 14 Dec 2011 20:14:28 +0000 (22:14 +0200)]
libgsm: Set options on the right object

This fixes regressions in decoding using the libgsm_ms decoder,
broken since 0eea21294354.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoh263dec: Fix regression / crash with lowres.
Michael Niedermayer [Thu, 15 Dec 2011 03:59:21 +0000 (04:59 +0100)]
h263dec: Fix regression / crash with lowres.
Fixes Ticket757
Bug Found by: ami_stuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoflicvideo: input buffer pointer checks.
Michael Niedermayer [Thu, 15 Dec 2011 03:42:13 +0000 (04:42 +0100)]
flicvideo: input buffer pointer checks.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoflicvideo: fix overread.
Michael Niedermayer [Thu, 15 Dec 2011 03:24:38 +0000 (04:24 +0100)]
flicvideo: fix overread.
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaacsbr: Fix memory corruption.
Michael Niedermayer [Thu, 15 Dec 2011 02:59:29 +0000 (03:59 +0100)]
aacsbr: Fix memory corruption.
Fixes Ticket760 and Ticket761
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: check chroma_format_idc range.
Michael Niedermayer [Thu, 15 Dec 2011 01:43:03 +0000 (02:43 +0100)]
h264: check chroma_format_idc range.
Fixes Ticket758
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoARM: dca: disable optimised decode_blockcodes() for old gcc
Mans Rullgard [Thu, 15 Dec 2011 00:29:49 +0000 (00:29 +0000)]
ARM: dca: disable optimised decode_blockcodes() for old gcc

Old gcc versions have trouble compiling this function, and
no simple, targeted test is possible.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoindeo3: check return values of allocate_frame_buffers()
Michael Niedermayer [Thu, 15 Dec 2011 00:30:38 +0000 (01:30 +0100)]
indeo3: check return values of allocate_frame_buffers()
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomtv: Fix FPE with 0 dimensions.
Michael Niedermayer [Wed, 14 Dec 2011 23:26:14 +0000 (00:26 +0100)]
mtv: Fix FPE with 0 dimensions.
Fixes Ticket755
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert "mpegvideo: remove abort() in ff_find_unused_picture()"
Michael Niedermayer [Wed, 14 Dec 2011 23:10:13 +0000 (00:10 +0100)]
Revert "mpegvideo: remove abort() in ff_find_unused_picture()"

This reverts commit 4f820131fa9fbb0a64d7cc469fa471905fc91944.

It is better to abort() than to have remotly exploitable arbitrary code
execution bugs. Even more so that this abort has never been triggered
by any input people threw at it.
If after more extensive testing its removial is found safe we can remove
the abort() later.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 14 Dec 2011 22:58:10 +0000 (23:58 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (23 commits)
  applehttp: Properly clean up if unable to probe a segment
  applehttp: Avoid reading uninitialized memory
  fate: Replace misleading "aac" in the name of an ADTS test with "adts".
  fate: Drop pointless "-an" from pictor test command.
  fate: split off image codec FATE tests into their own file
  fate: split off WMA codec FATE tests into their own file
  fate: split off lossless video and audio FATE tests into their own files
  fate: split off qtrle codec FATE tests into their own file
  fate: split off Ut Video codec FATE tests into their own file
  fate: split off screen codec FATE tests into their own file
  fate: split off Real Inc. codec FATE tests into their own file
  fate: split off AC-3 codec FATE tests into their own file
  mpegvideo: remove abort() in ff_find_unused_picture()
  rv40: NEON optimised loop filter strength selection
  rv40: rearrange loop filter functions
  configure: cosmetics: sort some lists where appropriate
  swscale_mmx: drop no longer required parameters from VSCALEX macros
  swscale: Mark yuv2planeX_8_mmx as MMX2; it contains MMX2 instructions.
  build: conditionally compile x86 H.264 chroma optimizations
  v410 encoder and decoder
  ...

Conflicts:
Changelog
configure
doc/developer.texi
doc/general.texi
libavcodec/arm/asm.S
libavcodec/avcodec.h
libavcodec/v410dec.c
libavcodec/v410enc.c
libavcodec/version.h
libavcodec/x86/Makefile
libavcodec/x86/dsputil_mmx.c
libswscale/x86/swscale_mmx.c
tests/Makefile
tests/fate2.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodnxhdenc: remove unused variable from context
Jean First [Wed, 14 Dec 2011 21:48:29 +0000 (22:48 +0100)]
dnxhdenc: remove unused variable from context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoljpeg: Check that lowres is 0 as lowres is not possible with ljpeg.
Michael Niedermayer [Wed, 14 Dec 2011 21:48:30 +0000 (22:48 +0100)]
ljpeg: Check that lowres is 0 as lowres is not possible with ljpeg.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Wed, 14 Dec 2011 21:31:42 +0000 (22:31 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: clear pkt_temp when pkt is freed.
  ffplay: Fix got_frame type.
  ffplay: add 10 minute seek support to ffplay
  ffplay: force setting video mode on fullscreen toggle

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years ago4xm: check if there are bits left in decode_i_block()
Michael Niedermayer [Wed, 14 Dec 2011 21:20:39 +0000 (22:20 +0100)]
4xm: check if there are bits left in decode_i_block()
Fixed Ticket753
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoriff: Fix freeing of random value.
Michael Niedermayer [Wed, 14 Dec 2011 20:23:03 +0000 (21:23 +0100)]
riff: Fix freeing of random value.
Fixes Ticket752
Bug-found-by: Diana Elena Muscalu
8 years agoffplay: clear pkt_temp when pkt is freed.
Michael Niedermayer [Tue, 13 Dec 2011 23:38:23 +0000 (00:38 +0100)]
ffplay: clear pkt_temp when pkt is freed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agoffplay: Fix got_frame type.
Michael Niedermayer [Tue, 13 Dec 2011 23:38:22 +0000 (00:38 +0100)]
ffplay: Fix got_frame type.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agoffplay: add 10 minute seek support to ffplay
Panagiotis H.M. Issaris [Mon, 28 Nov 2011 12:48:13 +0000 (13:48 +0100)]
ffplay: add 10 minute seek support to ffplay

Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agoffplay: force setting video mode on fullscreen toggle
Marton Balint [Tue, 13 Dec 2011 22:27:24 +0000 (23:27 +0100)]
ffplay: force setting video mode on fullscreen toggle

Fixes ticket #736. Based on the patch by glangshaw.

Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agoapplehttp: Properly clean up if unable to probe a segment
Martin Storsjö [Wed, 14 Dec 2011 18:34:58 +0000 (20:34 +0200)]
applehttp: Properly clean up if unable to probe a segment

This avoids a segfault if the probe function wasn't able to
determine the format.

The bug was found by Panagiotis H.M. Issaris.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoapplehttp: Avoid reading uninitialized memory
Martin Storsjö [Wed, 14 Dec 2011 18:33:39 +0000 (20:33 +0200)]
applehttp: Avoid reading uninitialized memory

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agofate: Replace misleading "aac" in the name of an ADTS test with "adts".
Diego Biurrun [Wed, 14 Dec 2011 18:31:22 +0000 (19:31 +0100)]
fate: Replace misleading "aac" in the name of an ADTS test with "adts".

8 years agofate: Drop pointless "-an" from pictor test command.
Diego Biurrun [Wed, 14 Dec 2011 19:00:33 +0000 (20:00 +0100)]
fate: Drop pointless "-an" from pictor test command.

8 years agofate: split off image codec FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 15:25:00 +0000 (16:25 +0100)]
fate: split off image codec FATE tests into their own file

8 years agofate: split off map_channel tests.
Clément Bœsch [Wed, 14 Dec 2011 19:04:32 +0000 (20:04 +0100)]
fate: split off map_channel tests.

Also introduce a fate-mapchan rule for all of them.

8 years agofate: split off WMA codec FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 18:47:46 +0000 (19:47 +0100)]
fate: split off WMA codec FATE tests into their own file

8 years agofate: split off lossless video and audio FATE tests into their own files
Diego Biurrun [Wed, 14 Dec 2011 18:26:00 +0000 (19:26 +0100)]
fate: split off lossless video and audio FATE tests into their own files

8 years agofate: split off qtrle codec FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 18:24:42 +0000 (19:24 +0100)]
fate: split off qtrle codec FATE tests into their own file