RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
36,215 Commits 36 Branches 392 Tags 305 MiB
Commit Graph

36215 Commits

Author SHA1 Message Date
Michael Niedermayer 452406bd5b ff*: Fix duplicatedly printed version info with -version 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-20 22:23:12 +01:00
Aneesh Dogra 1443ea93d9 4xm: Use bytestream2 functions to prevent overreads 
Fixes Bug 110.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-12-20 13:17:09 -05:00
Aneesh Dogra fd22616c59 bytestream: add a new set of bytestream functions with overread checking 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-12-20 13:17:03 -05:00
Nicolas George b0aaf304a7 Replace PATCHWELCOME by relevant error codes. 
This supersedes commit 154c0a8.
The bug was also reported by Rafaël Carré.
 2011-12-20 19:08:04 +01:00
Alex Converse 41bdd4adc4 mpegts: Suppress invalid timebase warnings on DMB streams. 
timestamp_len and timestamp_res intialize to zero.
 2011-12-20 09:52:05 -08:00
Alex Converse d9b89b23df mpegts: Fix typo in handling sections in the PMT. 
This was an error rebasing 4682a1dc3a for
commit. The "pes" variable guaranteed to be NULL in that block.
 2011-12-20 09:52:04 -08:00
Michael Niedermayer 154c0a8c98 replace ENOTSUP by AVERROR_PATCHWELCOME 
This unbreaks compilation
Found by: jb

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-20 18:34:44 +01:00
Derek Buitenhuis d1c1e350c6 doc: make developer.texi point to correct fate doc 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-20 18:12:36 +01:00
Michael Niedermayer c1acd58198 roq: fix excessive memory alloc 
Fixes Ticket802
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-20 18:07:14 +01:00
Michael Niedermayer a8469223f6 alac: Check for bitstream overread 
Fixes Ticket801
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-20 18:07:08 +01:00
Michael Niedermayer 65f0f9183b tm2: Check remaining size before init_get_bits() 
Fixes a null pointer dereference.
Fixes 2nd half of Ticket800
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-20 16:53:56 +01:00
Michael Niedermayer 3c7f75bd84 avidec: move eof check before continue. 
Fixes a infinite loop
Fixes half of Ticket800
Bug found by Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-20 16:52:42 +01:00
Alexander Strasser abab44086f doc: fate: Support building a plain text version 
Also create a plain text (.txt) file from fate.texi if the makeinfo
program is available.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-20 16:05:01 +01:00
Alexander Strasser a4872cfefe doc: fate: Move documentation from .txt to .texi 
The fate.txt file is ported to texinfo format. Therefore the
fate.txt is renamed to fate.texi. The contents of the already
existing fate.texi file are discarded.

  However there should be no loss of information. If you find
anything missing, please report.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-20 16:05:01 +01:00
Alexander Strasser e5cbf24e45 doc: build: TEXIDEP: Recognize verbatim includes 
When generating the .dep files for .texi sources, verbatim includes
(@verbatiminclude) should also be taken into account.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-20 16:05:01 +01:00
Stefano Sabatini f1622a17fd lavd/lavfi: reindent block in lavfi_read_header 2011-12-20 13:19:36 +01:00
Stefano Sabatini 4d475f7eb3 lavd/lavfi: add check in case pix_fmts cannot be allocated in lavfi_read_header() 2011-12-20 13:19:26 +01:00
Tomas Härdin 5b718009b2 mxfdec: Sanity-check SampleRate 
This avoids a SIGFPE if SampleRate is missing or set to naughty values.
 2011-12-20 11:34:48 +01:00
Tomas Härdin 1888bd1b6d mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps() 
Only the OPAtom demuxing logic is guaranteed to have index tables, meaning OP1a
files that lack an index would cause SIGSEGV.
 2011-12-20 11:32:59 +01:00
Michael Niedermayer aa1c590b29 swr: fix assert failure 
Bug found by: Oana Stratulat
GCI-id: 7211207

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-20 11:28:34 +01:00
Michael Niedermayer 1fa0ee127e Changelog: split version next and 0.9 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-20 11:28:34 +01:00
Carl Eugen Hoyos 6168e5812a Fix off-by-one error when decoding rigth-to-left targa. 2011-12-20 11:03:13 +01:00
Martin Storsjö b797f73520 vc1dec: Use the right pointer type for the tmp pointer 
This fixes warnings about assignment from incompatible
pointer type.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-20 11:04:26 +02:00
Tomas Härdin 54cbbdd25a mxfdec: Remove unused variables 2011-12-20 09:59:29 +01:00
Tomas Härdin 6e9081f4d8 mxfdec: Make sure x < index_table->nb_ptses 
Without this the demuxer will SIGSEGV on files with IndexEntryCount < IndexDuration
 2011-12-20 09:58:37 +01:00
Tomas Härdin 085249a379 mxfdec: Ignore the last entry in Avid's index table segments 
The last entry is the total size of the essence container.
Previously a TemporalOffset error would be logged, even though segments like
these are expected.
 2011-12-20 09:18:44 +01:00
Michael Niedermayer 0edf7ebcd6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: clear trailing bits in partially parsed NAL units
  vc1: Handle WVC1 interlaced stream
  xl: Fix overreads
  mpegts: rename payload_index to payload_size
  segment: introduce segmented chain muxer
  lavu: add AVERROR_BUG error value
  avplay: clear pkt_temp when pkt is freed.
  qcelpdec: K&R formatting cosmetics
  qcelpdec: cosmetics: drop some pointless parentheses
  x86: conditionally compile dnxhd encoder optimizations
  Revert "h264: skip start code search if the size of the nal unit is known"
  swscale: fix formatting and indentation of unscaled conversion routines.
  h264: skip start code search if the size of the nal unit is known
  cljr: fix buf_size sanity check
  cljr: Check if width and height are positive integers

Conflicts:
	libavcodec/cljr.c
	libavcodec/vc1dec.c
	libavformat/Makefile
	libavformat/mpegtsenc.c
	libavformat/segment.c
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-20 04:12:09 +01:00
Michael Niedermayer c8a441efe2 Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: remove global video state

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-20 00:15:06 +01:00
Janne Grunau 729ebb2f18 h264: clear trailing bits in partially parsed NAL units 
Trailing bits are likely to be non-zero if the NAL unit is truncated.
Clearing the bits make overreads of the bitstream less likely in this
case. Fixes playback of
http://streams.videolan.org/streams/mp4/Mr_MrsSmith-h264_aac.mp4 which
has a forbidden byte sequence of 0x00 0x00 0x00 in it SPS.
 2011-12-19 23:14:21 +01:00
Marton Balint 708df4ac66 ffplay: remove global video state 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2011-12-19 21:38:41 +01:00
Aneesh Dogra 0a6aff6936 vc1: Handle WVC1 interlaced stream 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-19 22:22:15 +02:00
Michael Niedermayer b08a742526 siff: simplify code by using ffio_limit() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-19 21:11:09 +01:00
Aneesh Dogra 00aad121d8 xl: Fix overreads 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-19 20:36:26 +02:00
Michael Niedermayer 1dcce49e10 soxdec: check av_malloc return. 
Bug found by: durandal_1707

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-19 19:11:49 +01:00
Luca Barbato 1c66862472 mpegts: rename payload_index to payload_size 
It holds the size of the current payload.
 2011-12-19 18:31:28 +01:00
Luca Barbato 02e8f03296 segment: introduce segmented chain muxer 
It behaves similarly to image2 muxer
 2011-12-19 18:31:28 +01:00
Luca Barbato 1ee5b5e823 lavu: add AVERROR_BUG error value 
It should be used to mark codepath that can be reached only through
programming error.
 2011-12-19 18:31:28 +01:00
Michael Niedermayer c9aa4cfdb1 avplay: clear pkt_temp when pkt is freed. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-12-19 12:22:14 -05:00
Michael Niedermayer 1d0ae92a25 eamad: pass & check errors 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-19 16:30:30 +01:00
Michael Niedermayer 03a9c9932d eamad: fix excessive memory allocation. 
Fixes Ticket792
Bug found by Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-19 16:27:52 +01:00
Asen Lekov 25c2d76b68 qcelpdec: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-12-19 16:22:30 +01:00
Diego Biurrun 2fd291846b qcelpdec: cosmetics: drop some pointless parentheses 2011-12-19 16:22:11 +01:00
Michael Niedermayer 32a92d3258 sws: Print an error in case of av_malloc() failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-19 16:02:52 +01:00
Michael Niedermayer 90cad5edf6 swscale: Fix several (real world) integer overflows. 
Fixes Ticket795
Bug Found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-19 16:02:51 +01:00
Diego Biurrun 30bbd5cbc0 x86: conditionally compile dnxhd encoder optimizations 2011-12-19 13:54:10 +01:00
Michael Niedermayer 9c5104e84e dsicin demuxer: Fix excessive malloc() 
use ffio_limit()
Fixes Ticket 790
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-19 11:57:34 +01:00
Michael Niedermayer e39eeb10d1 lavf: split out ffio_limit() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-19 11:57:34 +01:00
Michael Niedermayer f85334f58e tqi: Fix passing errors from the MB decode. This silences some valgrind warnings. 
Fixes second half of Ticket794
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-19 04:13:37 +01:00
Michael Niedermayer 608708009f adpcm: Fix crash 
Fixes half of Ticket794
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-19 04:09:23 +01:00
Michael Niedermayer 29179239f5 proresdec: add UPDATE_CACHE, should fix decoding with -Os 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-19 03:43:53 +01:00