ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-07 10:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,113 Commits 37 Branches 400 Tags 498 MiB
3f4c0dad16
Commit Graph

40113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mohamed Naufal
1d48e88d41 libstagefright: avoid potential deadlock on output MediaBuffer 
Maintain an output queue of AVFrames instead of MediaBuffers
so that the latter can be released early. This avoids a potential deadlock
between the stagefright decoder::read() and Stagefright_decode_frame()
 2012-04-19 01:08:50 +05:30
Michael Niedermayer
a02f8ef1d2 h263dec: Prevent dimension changes from leaking on errors in header parsing. 
This fixes crashes with frame threads caused by inconsistent context parameters.

Fixes Ticket1207

Found-by: John Villamil
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-18 21:21:28 +02:00
Mohamed Naufal
7b915a4045 libstagefright: explicitly set positive timestamps as stagefright expects them so 2012-04-19 00:02:53 +05:30
Diego Biurrun
0f53601ac6 ppc: drop unused function dct_quantize_altivec() 
This also allows dropping some PPC-specific ugliness from dsputil.[ch].
 2012-04-18 18:53:54 +02:00
Diego Biurrun
aa3f2cb584 mpegaudiodec: Do not discard mp_decode_frame() return value. 
This fixes the warning:
libavcodec/mpegaudiodec.c:1704:14: warning: variable ‘out_size’ set but not used
 2012-04-18 18:28:24 +02:00
Michael Niedermayer
601d072e68 diracdec: check xybsep 
Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-18 16:49:46 +02:00
Michael Niedermayer
e531e73a6f indeo: Make sure the to be used vlc table has been initilaized. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-18 16:42:34 +02:00
Robert Nagy
c58290e5e5 Reset pts_correction state on codec flush. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-18 15:34:34 +02:00
Michael Niedermayer
9ed388f598 ogm: Fix division by 0 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-18 15:30:34 +02:00
Michael Niedermayer
8201092241 h264: reset current_slice on context reinit 
This fixes a null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-18 15:30:34 +02:00
Michael Niedermayer
9f39d3d190 lavf: check that the context to avformat_open_input() is valid. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-18 15:30:34 +02:00
Michael Niedermayer
abe6330317 AVoption doxy: clarify a few needs in relation to AVClass less structs. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-18 15:30:34 +02:00
Mans Rullgard
3c58300269 matroska: do not set invalid default duration if frame rate is zero 
If a video track specifies a zero frame rate (invalid but occurs),
this results in a division by zero and subsequent undefined conversion
to integer.  Setting the default duration from the frame rate only
if the latter is greater than zero avoids such problems.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-04-18 13:48:20 +01:00
Alexander Bokovikov
fc882b6e9c Fix build dependencies for libvo-aac and libopencore-amrnb. 2012-04-18 10:32:13 +02:00
Michael Niedermayer
124eb7e476 aacdec: drop channel reseting code. 
its no longer needed and causes a race with the flv demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-18 09:43:13 +02:00
Michael Niedermayer
aa0f84df5a aacdec: disable new chan_config guessing code from libav. 
It causes more problems than it solves.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-18 09:37:38 +02:00
Michael Niedermayer
dbe29db8cb aacdec: more verbose overread error message 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-18 09:36:41 +02:00
Luca Barbato
ac97d47d9b mkv: use av_reduce instead of av_d2q for framerate estimation 
It avoids some rounding errors.
 2012-04-17 16:37:42 -07:00
Michael Niedermayer
68526dbc29 aacdec: reduce difference to alexs version of aacdec.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-18 00:50:18 +02:00
Luca Barbato
204bcdf56c mkv: report average framerate as minimal as well 
This is in line with other demuxers and overall seems more correct
than assuming codec time base.
 2012-04-17 15:47:22 -07:00
Michael Niedermayer
1232723741 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  aacenc: Fix issues with huge values of bit_rate.
  dv_tablegen: Drop unnecessary av_unused attribute from dv_vlc_map_tableinit().
  proresenc: multithreaded quantiser search
  riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE header
  avconv: only set the "channels" option when it exists for the specified input format
  avplay: update get_buffer to be inline with avconv
  aacdec: More robust output configuration.
  faac: Fix multi-channel ordering
  faac: Add .channel_layouts
  rtmp: Support 'rtmp_playpath', an option which overrides the stream identifier
  rtmp: Support 'rtmp_app', an option which overrides the name of application
  avutil: add better documentation for AVSampleFormat

Conflicts:
	libavcodec/aac.h
	libavcodec/aacdec.c
	libavcodec/aacenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-18 00:28:06 +02:00
Alex Converse
df8d5eaa14 avcodec_string: Favor AVCodecContext.codec over the default codec. 
This improves output for formats with more than one AVCodec.
 2012-04-17 14:51:23 -07:00
Alex Converse
b5d2bf964b cook: Make constants passed to AV_BE2NE32C() unsigned to avoid signed overflow. 2012-04-17 14:51:23 -07:00
Michael Niedermayer
a66675268f indeo5: dont run the wavelet transform over partially decoded bands. 
This fixes a null pointer dereference.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 20:02:13 +02:00
Robert Nagy
e90dfa6881 yadif: Improve pts calculation for is_second. 
Tested-by: Robert Nagy <ronag89@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 19:41:16 +02:00
sebist
7a3d2258a6 CrystalHD: Set aspect ratio. 
Signed-off-by: sebist <sebok.istvan@gmail.com>
Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 19:36:15 +02:00
sebist
e128182afd CrystalHD: fix pStride value. 
Signed-off-by: sebist <sebok.istvan@gmail.com>
Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 19:34:51 +02:00
Michael Niedermayer
ebf6d1d295 nuv: check buffer size before checking content. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-17 19:32:04 +02:00
Michael Niedermayer
096231d497 avidec: Dont crash on avi packets that belong to dv streams in dv in avi 
Fixes null pointer 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
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
Reimar Döffinger
0f96f0d996 aacenc: Fix issues with huge values of bit_rate. 
Do not pointlessly call ff_alloc_packet multiple times,
and fix an infinite loop by clamping the maximum
number of bits to target in the algorithm that does
not use lambda.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-04-17 10:25:28 -04: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
Diego Biurrun
db6e26d70c dv_tablegen: Drop unnecessary av_unused attribute from dv_vlc_map_tableinit(). 2012-04-17 13:36:43 +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
Kostya Shishkov
83632cbb11 proresenc: multithreaded quantiser search 2012-04-17 07:43:59 +02:00
Justin Ruggles
8099fc763b riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE header 
This matches the value for the plain WAVEFORMATEX header.
Also fixes stream copy to WAVE for non-16-bit raw pcm.
 2012-04-17 00:09:19 -04:00
Justin Ruggles
b1041f8048 avconv: only set the "channels" option when it exists for the specified input format 
This allows the user to specify an input channel layout without avconv aborting because the
"channels" option was not found.
 2012-04-16 23:44:49 -04: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