eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity
39,921 Commits 39 Branches 423 Tags
9789b6ca48cde61c052d9ecbd4cdd42ce51c053e
Commit Graph

39921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer 9789b6ca48 avidec: document early_exit argument 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 17:58:19 +02:00
Michael Niedermayer 2677697ac9 matroskadec: check headerstrip data availability. 
Fixes null ptr dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 17:58:19 +02:00
Robert Nagy a80217a5ee copy pts and format props between lavfi buffer and frame. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 16:07:23 +02:00
Michael Niedermayer c7c976c6d7 oggdec: Safety check against stream counts being inconsistent in seek() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 14:44:06 +02:00
Michael Niedermayer 9bb3b7d028 oggdec: Recreate streams only in the 1 stream case. 
Other cases are not supported and lead to inconsistencies which
can lead to out of array writes.

Reported-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 14:03:26 +02:00
Michael Niedermayer 15141f939d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  indeo3: add parens around some macro arguments
  h264: use proper PROLOGUE statement for a function using 8 registers.
  doc: Update sample Vim config with suitable (function) indentation settings.
  dv: Merge dvquant.h into dvdata.c where all other DV tables reside.
  dv: Move static tables only used in one place to where they are used.
  graphparser: set next to NULL on an entry extracted from inputs list
  doc/filters: update documentation.
  avconv: flush decoders immediately after an EOF.
  avconv: send EOF to vsrc_buffer.
  avconv: reindent.

Conflicts:
	doc/filters.texi
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 12:13:22 +02:00
Nicolas George 68ca49dc72 fate: libavutil tests do not require SAMPLES. 2012-04-17 12:01:31 +02:00
Nicolas George b0e7321cf0 parseutils: include errors in test output. 2012-04-17 11:03:29 +02:00
Michael Niedermayer 788a60d9d6 ffmpeg: make max frames work again, after merge 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 04:37:08 +02:00
Michael Niedermayer 56b9d9b5cd vf_thumbnail: colorspace changed from yv12 to rgb 
Not fully investigated but thumbnail supports rgb and not yv12 so
this is better ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 04:06:27 +02:00
Michael Niedermayer 9bf4134148 fate: fix vp8 size change regression 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 04:06:12 +02:00
Michael Niedermayer 5cd460ba63 vsrc_buffer: fix null ptr segfault 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 04:06:06 +02:00
Michael Niedermayer 0d115d7799 avfiltergraph: More advanced heuristic to select colorspace. 
This fixes regressions caused by switching from ffmpegs system to avfilters.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 04:05:56 +02:00
Michael Niedermayer 128fa1295c fate: gif: change checksum to bgr8 from rgb8 as thats what gets selected now 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 04:05:44 +02:00
Michael Niedermayer 84cd3729ef imgconvert: fix regression with fate-gif colorspaces. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 04:05:14 +02:00
Michael Niedermayer 052ab20805 ffmpeg: fix regression with jpeg pix fmts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 04:05:01 +02:00
Michael Niedermayer 89f8637979 ffmpeg: fix regression with png 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 04:04:56 +02:00
Michael Niedermayer 8a28fa010a ffmpeg: choose_pix_fmt: pass target fmt in 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 04:04:49 +02:00
Michael Niedermayer 4778783160 Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29' 
* commit '3b266da3d35f3f7a61258b78384dfe920d875d29':
  avconv: add support for complex filtergraphs.
  avconv: make filtergraphs global.
  avconv: move filtered_frame from InputStream to OutputStream.
  avconv: don't set output width/height directly from input value.
  avconv: move resample_{width,height,pix_fmt} to InputStream.
  avconv: remove a useless variable from OutputStream.
  avconv: get output pixel format from lavfi.
  graphparser: fix the order in which unlabeled input links are returned.
  avconv: change {input,output}_{streams,files} into arrays of pointers.
  avconv: don't pass input/output streams to some functions.

Conflicts:
	cmdutils.c
	cmdutils.h
	doc/ffmpeg.texi
	ffmpeg.c
	ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 04:03:50 +02:00
Nicolas George dcd207c4cb matroskadec: use av_grow_packet in merge_packets. 
It ensures that the packet is properly padded
and makes the code simpler.

Fixes trac ticket #1223.
 2012-04-16 22:17:24 +02:00
Reimar Döffinger 1a65d50ee7 mem.c: fix wrong comment. 
Overwriting the av_malloc etc. functions is not easily
possible anymore, even for systems that support overriding
symbols in shared libraries in principle.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-04-16 22:13:12 +02:00
Reimar Döffinger 071292b8c9 Respect -copyinkf for subtitles. 
Necessary to make it possible to copy teletext streams
(trac issue #531).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-04-16 22:13:12 +02:00
Reimar Döffinger 4a95876f4d Add skip_to_keyframe stream variable. 
This replaces the matroskadec one with the same name.
The advantage is not only easier reuse in other demuxers
but also that we can make the decisions after the parser.
This fixes seeking in files that mark the keyframes incorrectly,
for example the file in track ticket #1003.
The matroska variable is still kept to be able to complain
about such broken files.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-04-16 22:13:11 +02:00
Michael Niedermayer 4fa706a4a6 svq3: check the watermark height. 
Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 18:36:40 +02:00
Michael Niedermayer efe1ba7201 diracdec: check lowdelay bytes. 
Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 18:36:39 +02:00
Michael Niedermayer a30165c4a8 omadec: make sample rate table large enough to prevent out of array reading. 
The new values lead to error messages when used

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 18:36:39 +02:00
Michael Niedermayer c963189bc2 g729dec: initialize pitch_delay_int_prev to the minimum valid value. 
This prevents an out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 18:36:34 +02:00
Mans Rullgard 8b84e082ed indeo3: add parens around some macro arguments 
Without these, the expansion contains things like --1 with
some compilers resulting in build errors.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-04-16 16:09:08 +01:00
Ronald S. Bultje 87a246341b h264: use proper PROLOGUE statement for a function using 8 registers. 
Fixes crashes when using biweight on win64.
 2012-04-16 08:07:21 -07:00
Michael Niedermayer 31a45014f4 loco: fix 10l typo (missing case) 
Found-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 16:46:53 +02:00
Michael Niedermayer 47f0beadba dsicinav: Check for overread in RLE decode. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 16:44:12 +02:00
Michael Niedermayer 71d3c25a7e smacker: Check get_vlc() return values. 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 16:39:02 +02:00
Michael Niedermayer 8e77c3846e dcadec: fix global array overread. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 16:27:34 +02:00
Carl Eugen Hoyos bdeb54e176 Support decoding LOCO_CRGBA. 
Fixes a part of ticket #1222.
 2012-04-16 16:19:41 +02:00
Michael Niedermayer 884efd4e09 indeo4: avoid storing invalid values in quant_mat. 
Fixes a global array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 15:27:39 +02:00
Michael Niedermayer 474e31c904 4xmdemux: Check chunk size 
Fixes over reading the header array

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 15:27:39 +02:00
Michael Niedermayer e74fa25cb9 omadec: check GEOB sizes against buffer size 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 13:51:40 +02:00
Michael Niedermayer a10f71c1d6 vc1dec: add missing terminating element to mpeg4_video_profiles 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 13:41:17 +02:00
Michael Niedermayer e985cfd18b vc1dec: check end_mb_y / start_mb_y validity 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 13:36:11 +02:00
Michael Niedermayer c4ce870967 flvdec: allocate large enough buffer so get_bits() doesnt overread 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 12:01:55 +02:00
Michael Niedermayer fa1b2c8e18 ffv1: attempt to workaround intel CC fate issue. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 12:01:46 +02:00
Diego Biurrun b553a425fb doc: Update sample Vim config with suitable (function) indentation settings. 2012-04-16 10:12:45 +02:00
Diego Biurrun a3dbd459ff dv: Merge dvquant.h into dvdata.c where all other DV tables reside. 2012-04-16 10:04:57 +02:00
Diego Biurrun 05afc5f57d dv: Move static tables only used in one place to where they are used. 2012-04-16 10:04:56 +02:00
Anton Khirnov aff01de641 graphparser: set next to NULL on an entry extracted from inputs list 
Prevents it from referring to the rest of the list.
 2012-04-16 09:28:34 +02:00
Michael Niedermayer 8dfb13ea59 adxdec: Check available space before decoding block. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 02:18:10 +02:00
Michael Niedermayer 6d24fe2c3c segafilm: make the loop condition in film_read_packet() match the contents. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-16 02:18:09 +02:00
Robert Nagy ed66bbfcb9 lavfi/aresample: properly propagate pts == AV_NOPTS_VALUE; 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2012-04-16 01:08:00 +02:00
Robert Nagy 4d84c7ded6 yadif: fixed missing error handling for poll_frame. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-15 23:44:38 +02:00
Michael Niedermayer 3be0c86b97 sws: remove cliping in yuv2rgb code. 
This code should not be needed and it slows things down.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-15 23:38:42 +02:00