virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
35,960 Commits 37 Branches 400 Tags 460 MiB
608708009f
Commit Graph

35960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Niedermayer
a4755df523 h264: fix midstream extardata handling with dump.f4v 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-15 17:23:39 +01:00
Janne Grunau
ef5756aee0 fate: add -pix_fmt rgb48le to r210 test 
Fixes checksum on big endian systems.
 2011-12-15 15:56:15 +01:00
Martin Storsjö
bd2ff1a8bc flvenc: Support muxing 16 kHz nellymoser 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-15 16:53:54 +02:00
Michael Niedermayer
484b1cdd53 jpegdec: check return value of mjpeg_decode_dc() 
Fixes Ticket754

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-15 15:23:38 +01:00
Diego Biurrun
055c61b857 configure: refactor list of programs into a variable 2011-12-15 14:41:26 +01:00
Aneesh Dogra
beaf4012d2 fate: add r210 decoder test 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-12-15 14:34:09 +01:00
Michael Niedermayer
d998a6ddee h264: Fix build with --disable-everything --enable-decoder='h264' --disable-optimizations 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-15 14:09:23 +01:00
Diego Biurrun
6146d78d35 fate: split off Indeo FATE tests into their own file 2011-12-15 13:31:43 +01:00
Diego Biurrun
44b7e1b942 fate: split off ATRAC FATE tests into their own file 2011-12-15 13:31:41 +01:00
Derek Buitenhuis
6c3abd70fd 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>
 2011-12-15 13:31:40 +01:00
Mans Rullgard
b536c7a3e1 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>
 2011-12-15 11:02:59 +00:00
Shitiz Garg
566ee0eaf1 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>
 2011-12-15 11:07:20 +02:00
Martin Storsjö
1b35af3225 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>
 2011-12-15 09:08:40 +02:00
Martin Storsjö
8637af8d24 libgsm: Set options on the right object 
This fixes regressions in decoding using the libgsm_ms decoder,
broken since 0eea212943.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-15 09:08:21 +02:00
Michael Niedermayer
21270cffae h263dec: Fix regression / crash with lowres. 
Fixes Ticket757
Bug Found by: ami_stuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-15 04:59:21 +01:00
Michael Niedermayer
30b996d443 flicvideo: input buffer pointer checks. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-15 04:42:13 +01:00
Michael Niedermayer
afb2bac48d flicvideo: fix overread. 
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-15 04:24:38 +01:00
Michael Niedermayer
944f5b2779 aacsbr: Fix memory corruption. 
Fixes Ticket760 and Ticket761
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-15 03:59:29 +01:00
Michael Niedermayer
7fff64e00d h264: check chroma_format_idc range. 
Fixes Ticket758
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-15 02:43:03 +01:00
Mans Rullgard
f7de52354f 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>
 2011-12-15 01:02:58 +00:00
Michael Niedermayer
cd645c15d8 indeo3: check return values of allocate_frame_buffers() 
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-15 01:30:38 +01:00