aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '9f25a109922da43c1f81273a431d3b40cb5a785a'Michael Niedermayer2015-03-091-1/+4
|\ | | | | | | | | | | | | * commit '9f25a109922da43c1f81273a431d3b40cb5a785a': matroskaenc: Also validate chapter end time Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: Also validate chapter end timeVittorio Giovara2015-03-091-1/+4
| | | | | | | | | | | | | | This prevents it to be written as unsigned. Also add an error message. CC: libav-stable@libav.org Bug-Id: CID 1265717
* | Merge commit 'bfeb83a8b7d3fcf09a54d8dbc9c521e10bb17530'Michael Niedermayer2015-03-091-8/+0
|\| | | | | | | | | | | | | * commit 'bfeb83a8b7d3fcf09a54d8dbc9c521e10bb17530': rtpdec_hevc: Drop extra sanity check for size of input packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_hevc: Drop extra sanity check for size of input packetVittorio Giovara2015-03-091-8/+0
| | | | | | | | | | | | | | In this case len is always at least 3, since it is checked against RTP_HEVC_PAYLOAD_HEADER_SIZE + 1 before entering the switch block. Bug-Id: CID 1238784
* | avcodec/hevc_parser: use avpriv_find_start_code in hevc_split()zhaoxiu.zeng2015-03-091-13/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/options_table: remove extradata_size from the AVOptions tableMichael Niedermayer2015-03-091-1/+0
| | | | | | | | | | | | | | | | | | | | allowing access to the size but not the extradata itself is not useful and could lead to potential problems if writing happens through this field Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tests/fate-run: Print more details on failure of stddev / filesize comparesClaudio Freire2015-03-091-0/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmdec: limit the backward seek to the last resync positionAndreas Cadhalpun2015-03-091-2/+7
| | | | | | | | | | | | | | | | | | | | If resyncing leads to the same position as previously, it will again lead to a resync attempt, resulting in an infinite loop. Thus don't seek back beyond the last syncpoint. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add dependencies to configure file for vf_fftfiltArwa Arif2015-03-091-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmdec: make sure the time base is validAndreas Cadhalpun2015-03-091-0/+11
| | | | | | | | | | | | | | A negative time base can trigger assertions. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '46d4d8575979a24a8d026d9805039b724e0e3e5f'Michael Niedermayer2015-03-092-2/+3
|\| | | | | | | | | | | | | * commit '46d4d8575979a24a8d026d9805039b724e0e3e5f': movenc: Avoid writing separate flags for the first sample if not necessary Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Avoid writing separate flags for the first sample if not necessaryMartin Storsjö2015-03-091-1/+2
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '00d751d4fc20ec88d2cc2c9f39ec8b9e9c8cdeba'Michael Niedermayer2015-03-092-11/+16
|\| | | | | | | | | | | | | * commit '00d751d4fc20ec88d2cc2c9f39ec8b9e9c8cdeba': movenc: Set tfhd default sample flags based on actual samples, if possible Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Set tfhd default sample flags based on actual samples, if possibleMartin Storsjö2015-03-091-10/+15
| | | | | | | | | | | | | | | | | | | | This avoids assuming that e.g. audio samples are marked as sync samples. This allows omitting the sample flags from trun, if the default flags happen to be right for all the samples. Signed-off-by: Martin Storsjö <martin@martin.st>
* | doc: Clarify documentation for fade duration.Carl Eugen Hoyos2015-03-091-1/+2
| |
* | doc: Improve video creation examples (from image2).Carl Eugen Hoyos2015-03-091-2/+2
| | | | | | | | | | The examples used to drop frames in most cases which was probably not what users expected.
* | Fix the intra_dc_precision API doc.Carl Eugen Hoyos2015-03-091-1/+1
| | | | | | | | The mpegvideo decoder has set intra_dc_precision since forever.
* | lavc/ffv1enc: Auto-select -coder 1 for >8bit also for yuv.Carl Eugen Hoyos2015-03-091-0/+4
| | | | | | | | Reported-by: Christoph Gerstbauer
* | ffmdec: fix infinite loop at EOFAndreas Cadhalpun2015-03-091-2/+2
| | | | | | | | | | | | | | | | If EOF is reached, while skipping bytes, avio_tell(pb) won't change anymore, resulting in an infinite loop. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmdec: initialize f_cprv, f_stvi and f_stauAndreas Cadhalpun2015-03-091-1/+1
| | | | | | | | | | | | | | | | They are used in a switch statement, but it is not guaranteed that the COMM case (where they are set to 0) is reached before the other cases. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d'Michael Niedermayer2015-03-090-0/+0
|\| | | | | | | | | | | | | | | * commit '0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d': utvideodec: Handle slice_height being zero See: 3881606240953b9275a247a1c98a567f3c44890f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * utvideodec: Handle slice_height being zeroMichael Niedermayer2015-03-091-0/+4
| | | | | | | | | | | | | | | | | | | | Fixes out of array accesses. CC: libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Bug-Id: CVE-2014-9604 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'Michael Niedermayer2015-03-089-6/+26
|\| | | | | | | | | | | | | | | | | | | * commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f': avprobe: Export coded_{width,height} in -show_streams Conflicts: avprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avprobe: Export coded_{width,height} in -show_streamsVittorio Giovara2015-03-081-0/+2
| |
* | avcodec/tiff: move bpp check to after "end:"Michael Niedermayer2015-03-081-7/+7
| | | | | | | | | | | | This ensures that all current and future code-pathes get bpp checked Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ae5e1f3d663a8c9a532d89e588cbc61f171c9186'Michael Niedermayer2015-03-081-0/+8
|\| | | | | | | | | | | | | | | * commit 'ae5e1f3d663a8c9a532d89e588cbc61f171c9186': tiff: Check that there is no aliasing in pixel format selection See: e1c0cfaa419aa5d320540d5a1b3f8fd9b82ab7e5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: Check that there is no aliasing in pixel format selectionAnton Khirnov2015-03-081-0/+8
| | | | | | | | | | | | | | | | | | Fixes possible issues with unexpected bpp/bppcount values. CC: libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Bug-Id: CVE-2014-8544 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | RELEASE: update to 2.6.gitJames Almer2015-03-081-1/+1
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | ffserver: remove stale debug stanzaReynaldo H. Verdejo Pinochet2015-03-081-1/+0
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: move assignment outside condition evalReynaldo H. Verdejo Pinochet2015-03-081-2/+5
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: break some too long linesReynaldo H. Verdejo Pinochet2015-03-081-9/+18
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | doc: avoid the incorrect phrase 'allow to'Andreas Cadhalpun2015-03-086-8/+8
| | | | | | | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_edgedetect: Change enums to int, which are accessed via AVOption ↵Michael Niedermayer2015-03-081-1/+1
| | | | | | | | | | | | | | | | as int This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_curves: Change enums to int, which are accessed via AVOption as intMichael Niedermayer2015-03-081-1/+1
| | | | | | | | | | | | This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_drawtext: Change enums to int, which are accessed via AVOption ↵Michael Niedermayer2015-03-081-1/+1
| | | | | | | | | | | | as int This fixes depending on implementation defined behavior
* | fate: add test for vp90-2-trac4359.webmJames Almer2015-03-082-0/+10
| | | | | | | | | | | | | | Regression test for the bug from trac ticket #4359 fixed in commit efff3854 Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '6448f15af02f2c3cf0df8cb8237957e426041f2d'Michael Niedermayer2015-03-081-1/+1
|\| | | | | | | | | | | | | * commit '6448f15af02f2c3cf0df8cb8237957e426041f2d': mxfdec: Fix the error handling for when strftime fails Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxfdec: Fix the error handling for when strftime failsMartin Storsjö2015-03-081-1/+1
| | | | | | | | | | | | The str variable is a char ** here. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8'Michael Niedermayer2015-03-081-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8': xcbgrab: Free the host string after checking the connection Conflicts: libavdevice/xcbgrab.c No change as the bug was not in FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xcbgrab: Free the host string after checking the connectionLuca Barbato2015-03-081-3/+6
| | | | | | | | | | | | | | Prevent an use after free in the error message. Bug-Id: CID 1274040 CC: libav-stable@libav.org
* | Merge commit '0025f7408a0fab2cab4a950064e4784a67463994'Michael Niedermayer2015-03-081-20/+15
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '0025f7408a0fab2cab4a950064e4784a67463994': vorbis: Check the vlc value in setup_classifs Conflicts: libavcodec/vorbisdec.c See: ae038c0914460646503be083e30e3971093239a1 See: 709cae2bcbc0ea2c5d46c932b3d8301cf8f98e6b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbis: Check the vlc value in setup_classifsLuca Barbato2015-03-081-16/+14
| | | | | | | | | | | | | | | | The valid returned values are always at most 11bit. Remove the previous check that assumed larger values plausible and use a signed integer to check get_vlc2 return values. CC: libav-stable@libav.org
* | Merge commit '62de77ffcaebd42fe685b8426da56b89b2532318'Michael Niedermayer2015-03-081-3/+4
|\| | | | | | | | | | | | | * commit '62de77ffcaebd42fe685b8426da56b89b2532318': vorbis: Use a local codebook variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbis: Use a local codebook variableLuca Barbato2015-03-081-3/+4
| | | | | | | | Makes the code a little simpler.
* | doc/filters: Add some random examples for fftfiltMichael Niedermayer2015-03-081-0/+23
| | | | | | | | | | Reviewed-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vp9: included uses_2pass member in vp9_ref_frame().Ronald S. Bultje2015-03-081-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vp9: split segmentation map / mvpair references.Ronald S. Bultje2015-03-081-38/+34
| | | | | | | | | | | | This prevents a memcpy if segmentation.update_map == false. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/af_astats: redo zero channel handlingPaul B Mahol2015-03-081-4/+2
| | | | | | | | | | Suggested-by: Nicolas George Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '0f9f7969ef4df3661131cede3e8cc770e1ea3db8'Michael Niedermayer2015-03-080-0/+0
|\| | | | | | | | | | | | | | | * commit '0f9f7969ef4df3661131cede3e8cc770e1ea3db8': rmdec: Improve message for demux error See: 3880b4541ace2697f380ae1f43cb2299efeb2cc7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rmdec: Improve message for demux errorCarl Eugen Hoyos2015-03-081-1/+1
| | | | | | | | | | | | | | Use correct context, reduce log level, don't assume it is a video stream, and print the tag of the unknown stream. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>