aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | libstagefright: avoid potential deadlock on output MediaBufferMohamed Naufal2012-04-191-73/+86
| | | | | | | | | | | | | | | | | | 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()
| * | libstagefright: explicitly set positive timestamps as stagefright expects ↵Mohamed Naufal2012-04-193-9/+27
| | | | | | | | | | | | them so
| * | Merge branches 'stagefright' and 'stagefright-test' into stagefright-testMohamed Naufal2012-04-110-0/+0
| | |
* | | Make tiff-in-mov QuickTime-compatible for more colour-spaces.Carl Eugen Hoyos2012-04-181-0/+5
| | | | | | | | | | | | Fixes ticket #1228.
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-187-477/+17
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ppc: drop unused function dct_quantize_altivec() mpegaudiodec: Do not discard mp_decode_frame() return value. matroska: do not set invalid default duration if frame rate is zero mkv: use av_reduce instead of av_d2q for framerate estimation mkv: report average framerate as minimal as well avcodec_string: Favor AVCodecContext.codec over the default codec. cook: Make constants passed to AV_BE2NE32C() unsigned to avoid signed overflow. Conflicts: libavcodec/cook.c libavcodec/ppc/mpegvideo_altivec.c libavcodec/utils.c libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ppc: drop unused function dct_quantize_altivec()Diego Biurrun2012-04-183-465/+0
| | | | | | | | | | | | This also allows dropping some PPC-specific ugliness from dsputil.[ch].
| * | mpegaudiodec: Do not discard mp_decode_frame() return value.Diego Biurrun2012-04-181-0/+4
| | | | | | | | | | | | | | | This fixes the warning: libavcodec/mpegaudiodec.c:1704:14: warning: variable ‘out_size’ set but not used
| * | matroska: do not set invalid default duration if frame rate is zeroMans Rullgard2012-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | mkv: use av_reduce instead of av_d2q for framerate estimationLuca Barbato2012-04-171-3/+5
| | | | | | | | | | | | It avoids some rounding errors.
| * | mkv: report average framerate as minimal as wellLuca Barbato2012-04-171-0/+1
| | | | | | | | | | | | | | | This is in line with other demuxers and overall seems more correct than assuming codec time base.
| * | avcodec_string: Favor AVCodecContext.codec over the default codec.Alex Converse2012-04-171-1/+3
| | | | | | | | | | | | This improves output for formats with more than one AVCodec.
| * | cook: Make constants passed to AV_BE2NE32C() unsigned to avoid signed overflow.Alex Converse2012-04-171-2/+2
| | |
* | | h263dec: Prevent dimension changes from leaking on errors in header parsing.Michael Niedermayer2012-04-181-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | diracdec: check xybsepMichael Niedermayer2012-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | Fixes division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | indeo: Make sure the to be used vlc table has been initilaized.Michael Niedermayer2012-04-181-1/+1
| | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Reset pts_correction state on codec flush.Robert Nagy2012-04-181-0/+3
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ogm: Fix division by 0Michael Niedermayer2012-04-181-1/+1
| | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | h264: reset current_slice on context reinitMichael Niedermayer2012-04-181-0/+1
| | | | | | | | | | | | | | | | | | | | | This fixes a null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | lavf: check that the context to avformat_open_input() is valid.Michael Niedermayer2012-04-181-0/+4
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | AVoption doxy: clarify a few needs in relation to AVClass less structs.Michael Niedermayer2012-04-181-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Fix build dependencies for libvo-aac and libopencore-amrnb.Alexander Bokovikov2012-04-181-3/+6
| | |
* | | aacdec: drop channel reseting code.Michael Niedermayer2012-04-181-3/+0
| | | | | | | | | | | | | | | | | | its no longer needed and causes a race with the flv demuxer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | aacdec: disable new chan_config guessing code from libav.Michael Niedermayer2012-04-181-1/+1
| | | | | | | | | | | | | | | | | | It causes more problems than it solves. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | aacdec: more verbose overread error messageMichael Niedermayer2012-04-181-6/+6
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | aacdec: reduce difference to alexs version of aacdec.cMichael Niedermayer2012-04-181-6/+8
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-1811-195/+403
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * | aacenc: Fix issues with huge values of bit_rate.Reimar Döffinger2012-04-172-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | dv_tablegen: Drop unnecessary av_unused attribute from dv_vlc_map_tableinit().Diego Biurrun2012-04-171-2/+1
| | |
| * | proresenc: multithreaded quantiser searchKostya Shishkov2012-04-171-60/+101
| | |
| * | riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE ↵Justin Ruggles2012-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | header This matches the value for the plain WAVEFORMATEX header. Also fixes stream copy to WAVE for non-16-bit raw pcm.
| * | avconv: only set the "channels" option when it exists for the specified ↵Justin Ruggles2012-04-161-2/+10
| | | | | | | | | | | | | | | | | | | | | input format This allows the user to specify an input channel layout without avconv aborting because the "channels" option was not found.
| * | avplay: update get_buffer to be inline with avconvLuca Barbato2012-04-161-0/+4
| | | | | | | | | | | | | | | The buffer must have its dimension, pixel format and aspect ratio set.
| * | aacdec: More robust output configuration.Alex Converse2012-04-163-113/+173
| | | | | | | | | | | | | | | | | | Save the old output configuration (if it has been used successfully) when trying a new configuration. If the new configuration fails to decode, restore the last successful configuration.
| * | faac: Fix multi-channel orderingCarl Eugen Hoyos2012-04-161-0/+10
| | | | | | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * | faac: Add .channel_layoutsAlex Converse2012-04-161-0/+12
| | |
| * | rtmp: Support 'rtmp_playpath', an option which overrides the stream identifierSamuel Pitoiset2012-04-161-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | This option is the stream identifier to play or to publish. Sometimes the URL parser cannot determine the correct playpath automatically, so it must be given explicitly using this option (ie. -rtmp_playpath). Signed-off-by: Martin Storsjö <martin@martin.st>
| * | rtmp: Support 'rtmp_app', an option which overrides the name of applicationSamuel Pitoiset2012-04-161-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | This option is the name of application to connect on the RTMP server. Sometimes the URL parser cannot determine the app name automatically, so it must be given explicitly using this option (ie. -rtmp_app). Signed-off-by: Martin Storsjö <martin@martin.st>
| * | avutil: add better documentation for AVSampleFormatJustin Ruggles2012-04-161-1/+26
| | |
* | | indeo5: dont run the wavelet transform over partially decoded bands.Michael Niedermayer2012-04-171-0/+5
| | | | | | | | | | | | | | | | | | | | | This fixes a null pointer dereference. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | yadif: Improve pts calculation for is_second.Robert Nagy2012-04-171-3/+14
| | | | | | | | | | | | | | | Tested-by: Robert Nagy <ronag89@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | CrystalHD: Set aspect ratio.sebist2012-04-171-0/+50
| | | | | | | | | | | | | | | | | | Signed-off-by: sebist <sebok.istvan@gmail.com> Reviewed-by: Philip Langdale <philipl@overt.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | CrystalHD: fix pStride value.sebist2012-04-171-2/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: sebist <sebok.istvan@gmail.com> Reviewed-by: Philip Langdale <philipl@overt.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | nuv: check buffer size before checking content.Michael Niedermayer2012-04-171-1/+1
| | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avidec: Dont crash on avi packets that belong to dv streams in dv in aviMichael Niedermayer2012-04-171-0/+5
| | | | | | | | | | | | | | | | | | | | | Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avidec: document early_exit argumentMichael Niedermayer2012-04-171-0/+4
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | matroskadec: check headerstrip data availability.Michael Niedermayer2012-04-171-0/+4
| | | | | | | | | | | | | | | | | | | | | Fixes null ptr dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | copy pts and format props between lavfi buffer and frame.Robert Nagy2012-04-171-0/+3
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | oggdec: Safety check against stream counts being inconsistent in seek()Michael Niedermayer2012-04-171-0/+2
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | oggdec: Recreate streams only in the 1 stream case.Michael Niedermayer2012-04-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-1711-241/+228
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>