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

35931 Commits

Author SHA1 Message Date
Derek Buitenhuis bb9747c8ee 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>
 2011-12-16 20:55:53 +01:00
Derek Buitenhuis 365e1ec26d 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>
 2011-12-16 20:55:46 +01:00
Michael Niedermayer 6d8e6fe9db CODEC_ID_SOL_DPCM: Fix used write buffer. 
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-16 20:34:34 +01:00
Ronald S. Bultje 0b4c323213 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.
 2011-12-16 11:24:18 -08:00
Shitiz Garg 4af0262f7d 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>
 2011-12-16 20:23:38 +01:00
Michael Niedermayer 7b92863f30 ffmpeg: Fix killing [Y/n] prompt with ctrl-c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-16 19:43:54 +01:00
Michael Niedermayer cf7076ee96 ffmpeg: exit() on repeated ctrl-c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-16 19:37:32 +01:00
Michael Niedermayer 3d07e0aba0 h264: return the consumed amountg in case of Q264 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-16 19:05:19 +01:00
Michael Niedermayer 227960427b h264: retuen the amount read in case of NAL_END_SEQUENCE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-16 18:55:04 +01:00
Michael Niedermayer 902c090413 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>
 2011-12-16 18:52:56 +01:00
Michael Niedermayer f890cb948c mtvdemuxer: fix segfault caused by truncated packets. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-16 16:59:28 +01:00
Michael Niedermayer ee181f84a3 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>
 2011-12-16 16:59:24 +01:00
Michael Niedermayer 207d9eab5a txd/westwood: remove demuxer specific overallocate solutions as the new generic code 
handles it fine.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-16 16:58:20 +01:00
Michael Niedermayer 559ae20dda lavf: Update AVIOContext.maxsize when hitting the end. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-16 16:58:12 +01:00
Mans Rullgard b8909cb364 get_bits: remove useless pointer casts 
These pointers are already of the correct type.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-12-16 15:34:35 +00:00
Diego Biurrun 54e75be420 configure: refactor lists of tests and components into variables 2011-12-16 15:46:34 +01:00
Mans Rullgard 11b1db2759 rv40: NEON optimised weak loop filter 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-12-16 14:36:01 +00:00
Dominique Leuenberger 39f59a8da7 RELEASE: We're now at 0.9.0.git 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-16 15:20:13 +01:00
Vladimir Pantelic 65a25adc97 mpegts: replace some magic numbers with the existing define 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-16 11:45:36 +02:00
Michael Niedermayer 62adc60b97 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>
 2011-12-16 06:13:04 +01:00
Michael Niedermayer f72601d063 txddemux: Limit allocated packets to filesize. 
Fixes Ticket772
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-16 06:02:56 +01:00
Michael Niedermayer a000975444 thp: simplify overallocate checks. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-16 06:02:14 +01:00
Michael Niedermayer 47572323f2 lavf: add internal AVIOContext.maxsize 
This allows simple and generic limiting of allocations used for packets.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-16 05:59:43 +01:00
Michael Niedermayer 482ee63641 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>
 2011-12-16 05:35:04 +01:00
Michael Niedermayer e098fba5d9 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>
 2011-12-16 05:13:58 +01:00
Michael Niedermayer 84e57702ea configure: disable avconv again. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-16 04:34:03 +01:00
Michael Niedermayer 1f99939a63 j2kdec: Fix integer overflow leading to a segfault 
Fixes Ticket776
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-16 04:16:01 +01:00
Michael Niedermayer 0988a6a035 movenc: disable iods by default 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Approved-by: MP4_maniac
Approved-by: Baptiste Coudurier
 2011-12-16 03:50:19 +01:00
Michael Niedermayer c402c1c976 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>
 2011-12-16 03:25:20 +01:00
Michael Niedermayer e2a16e82b1 westwooddemux: dont require avio_size() functionality. 
Found by reimar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-16 03:25:20 +01:00
Carl Eugen Hoyos 9994643fdd 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
 2011-12-16 02:33:25 +01:00
Janne Grunau 72cb904453 swscale: add unscaled packed 16 bit per component endianess conversion 2011-12-16 01:41:33 +01:00
Michael Niedermayer 175cc378b3 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>
 2011-12-16 01:23:15 +01:00
Carl Eugen Hoyos 56669837ce Fix typo in v210 decoder options. 2011-12-16 01:04:43 +01:00
Michael Niedermayer 1f273c2bf2 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>
 2011-12-15 23:58:31 +01:00
Nicolas George 1509bd3e9e lavd/lavfi: remove a duplicated line. 2011-12-15 23:34:25 +01:00
Alex Converse d3b8bde2f1 movenc: Rudimentary IODs support. 2011-12-15 14:06:13 -08:00
Michael Niedermayer d0f7927177 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>
 2011-12-15 22:52:57 +01:00
Tom Evans ffa1f541b3 libavdevice: Fix v4l2 compilation under FreeBSD 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-15 21:48:03 +01:00
Michael Niedermayer 7f9369b743 lavf: update rfps debug code. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-15 21:28:54 +01:00
Michael Niedermayer d19ca77f42 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>
 2011-12-15 21:28:54 +01:00
Michael Niedermayer 5f95c130a0 mov: Fix near infinite loop in stsd parsing. 
Fixes Ticket768
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-15 21:28:54 +01:00
Michael Niedermayer 4255d6d96c westwooddemuxer: use av_get_packet() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-15 21:28:54 +01:00
Michael Niedermayer f68b19fc28 westwooddemuxer: Fix 1gb alloc 
Fixes Ticket765
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-15 21:28:54 +01:00
Carl Eugen Hoyos 6f2054c589 Fix linesize for bmp with bitdepth < 8. 
Fixes ticket #751.
 2011-12-15 19:23:07 +01:00
Mans Rullgard dabba0c676 v410enc: fix output buffer size check 
The encoder clearly needs width * height * 4 bytes.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-12-15 17:47:10 +00:00
Mans Rullgard 0249144a1c 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>
 2011-12-15 17:47:10 +00:00
Nicolas George 2c82ab946b lavf: add SBG demuxer. 2011-12-15 18:38:06 +01:00
Nicolas George b33fd66f46 lavc: add ffwavesynth pseudo-codec. 2011-12-15 18:38:04 +01:00
Michael Niedermayer 62b5197f97 arm: add back ldr_dpren macro that was lost. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-15 17:24:43 +01:00