summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avcodec/pafvideo: remove unused headerPaul B Mahol2014-08-19
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/proresenc_kostya: allocate 1 slice more to avoid triggering the ↵Michael Niedermayer2014-08-19
| | | | | | | reallocation warning when the used space is actually less than the allocated Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/proresenc_kostya: set initial max_slice_size based on ↵Michael Niedermayer2014-08-19
| | | | | | | | | | frame_size_upper_bound If the initial max_slice_size is 0 then reallocation is disabled for the first slice. Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* huffyuvenc: add a non-deterministic optionChristophe Gisquet2014-08-19
| | | | | | | | | | | | Not actually used in huffyuvenc, but rather in setting the frame threading. Example for some files: context=0: 851974 27226 1137281 context=1,ND=0: 471819 22604 972351 context=1,ND=1: 472875 22673 972582 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter/atempo: Flush all buffered input samplesPavel Koshevoy2014-08-19
| | | | | | Fixes ticket #3829 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/cinedec: allow number zero in metadataBen Hagen2014-08-19
|
* lavu/log: add device category macrosLukasz Marek2014-08-18
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavd/pulse_audio_dec: use default source when no input providedLukasz Marek2014-08-18
| | | | | | | | | PulseAudio expilitly requires name of the source. This patch makes it use default source when not provided. It simplifies programistic use. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* alac: add option to decoded incorrect ALACChristophe Gisquet2014-08-18
| | | | | | | | | Prior to 56.1.100, incorrect ALAC files for 24bps content were produced, in particular not decoding losslessly. Add an option to allow correctly decoding those streams. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51'Michael Niedermayer2014-08-18
|\ | | | | | | | | | | | | | | | | | | | | * commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51': proresenc: Properly account for alpha plane Conflicts: libavcodec/proresenc_kostya.c See: 117bc8e6ffc744fedcf77edf2fdb33c964b83370 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * proresenc: Properly account for alpha planeChristophe Gisquet2014-08-18
| | | | | | | | | | | | | | | | | | | | The packet buffer allocation considers the alpha channel as DCT-coded, while it is actually run-coded and thus requires a larger buffer. CC: libav-stable@libav.org Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '45ce880a9b3e50cfa088f111dffaf8685bd7bc6b'Michael Niedermayer2014-08-18
|\| | | | | | | | | | | | | * commit '45ce880a9b3e50cfa088f111dffaf8685bd7bc6b': proresenc: Realloc if buffer is too small Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * proresenc: Realloc if buffer is too smallChristophe Gisquet2014-08-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The buffer allocation may be incorrect (e.g. with an alpha plane), and currently causes the buffer to be set to NULL by init_put_bits, causing a crash later on. So, detect that situation, and if detected, reallocate the buffer and ask for a sample that shows the problem. CC: libav-stable@libav.org Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '58b68e4fdea22e22178e237bda950b09cc6f363a'Michael Niedermayer2014-08-18
|\| | | | | | | | | | | | | | | | | | | | | * commit '58b68e4fdea22e22178e237bda950b09cc6f363a': proresenc: Report buffer overflow Conflicts: libavcodec/proresenc_kostya.c See: 52b81ff4635c077b2bc8b8d3637d933b6629d803 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * proresenc: Report buffer overflowChristophe Gisquet2014-08-18
| | | | | | | | | | | | | | | | | | | | If the allocated size, despite best efforts, is too small, exit with the appropriate error. CC: libav-stable@libav.org Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421'Michael Niedermayer2014-08-18
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421': proresenc: Remove unneeded parameters from encode_alpha_plane() Conflicts: libavcodec/proresenc_kostya.c See: bf10f09bccdcfdb41b9f5bbae01d55961bfd0693 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * proresenc: Remove unneeded parameters from encode_alpha_plane()Christophe Gisquet2014-08-18
| | | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0'Michael Niedermayer2014-08-18
|\| | | | | | | | | | | | | * commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0': tiff: Return proper error for missing LZMA compression Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: Return proper error for missing LZMA compressionDiego Elio Pettenò2014-08-18
| | | | | | | | | | | | | | | | The LZMA support is a semi-official extension supported by libtiff 4.0.0 and later. Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'dd35d451fbc34795a8d19ac6c281bed53c42a29b'Michael Niedermayer2014-08-18
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'dd35d451fbc34795a8d19ac6c281bed53c42a29b': doc: Change wrong term to avoid confusion Conflicts: doc/developer.texi No change, as the wrong term is not part of our docs Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: Change wrong term to avoid confusionGabriel Dume2014-08-18
| | | | | | | | | | | | A function declaration is the prototype. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/a64: Avoid segfault in a64_write_header() when stream codec is not openAndrey Myznikov2014-08-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/iff: rudimentary support for animationsPaul B Mahol2014-08-18
| | | | | | | | | | | | For now only first frame is decoded. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec: export motion vectors in frame side data on demandClément Bœsch2014-08-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reasoning behind this addition is that various third party applications are interested in getting some motion information out of a video "for free" when it is available. It was considered to export other information as well (such as the intra information about the block, or the quantization) but the structure might have ended up into a half full-generic, half full of codec specific cruft. If more information is necessary, it should either be added in the "flags" field of the AVMotionVector structure, or in another side-data. This commit also includes an example exporting them in a CSV stream.
* | avdevice/v4l2: try to fix build for openbsdMichael Niedermayer2014-08-18
| | | | | | | | | | Found-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wvdec: check for eof in wv_read_block_header()Paul B Mahol2014-08-18
| | | | | | | | | | | | Fixes Ticket #3865 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | cafdec: check for eof in read_info_chunk()Paul B Mahol2014-08-18
| | | | | | | | | | | | Fixes Ticket #3864 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '42604902292ebaba39b13e8efd98419908518019'Michael Niedermayer2014-08-18
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '42604902292ebaba39b13e8efd98419908518019': Prepare for 11_beta1 Release Conflicts: RELEASE No change, not merged Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Prepare for 11_beta1 ReleaseReinhard Tartler2014-08-17
| |
* | gifdec: use truncated width for image manipulationChristophe Gisquet2014-08-18
| | | | | | | | | | | | | | | | | | | | | | | | | | Some files seem to have an off-by-one error. In most cases, it appears to be on the image width. Therefore, if the decoded image doesn't fit in the screen: - If it is wider than the screen (and the lzw decoding buffer), reject it; - Otherwise, decode the indicated amount, but only write a truncated amount to the screen. Fixes ticket #3538. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/wavdec: add sanity check for AVCodecContext.channelsJames Almer2014-08-18
| | | | | | | | | | | | | | | | Fixes ticket #3862. As a side effect, this also fixes aac_latm in wav. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/v4l2: do not fail when VIDIOC_ENUMSTD returns ENODATAAndre Wolokita2014-08-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of September 14 2012, v4l_enumstd() will return ENODATA when a device's std field is set to 0. That is, the device does not have a standard format. In order to properly handle this case, v4l2_set_parameters should catch the ENODATA code and break instead of failing. Below is the v4l2-core commit describing this change. >>commit a5338190efc7cfa8c99a6856342a77d21c9a05cf >>Author: Hans Verkuil <hans.verkuil@cisco.com> >>Date: Fri Sep 14 06:45:43 2012 -0300 >> >> [media] v4l2-core: tvnorms may be 0 for a given input, handle that case >> >> Currently the core code looks at tvnorms to see whether ENUMSTD >> or G_PARM should be enabled. This is not a good check for drivers >> that support the STD API on one input and the DV Timings API on another. >> In that case tvnorms may be 0. >> Instead check whether s_std is present (for ENUMSTD) or whether g_std or >> current_norm is present for g_parm. >> Also, in the enumstd core function return ENODATA if tvnorms is 0, >> because in that case the current input does not support the STD API >> and ENUMSTD should return ENODATA for that. >> >> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> >> Reviewed-by: Sakari Ailus <sakari.ailus@iki.fi> >> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
* | ffserver: warn if config uses a system portReynaldo H. Verdejo Pinochet2014-08-17
| | | | | | | | | | | | | | | | Should be harmless as far as users know what they are doing but an informative warning wont hurt. For details, refer to http://tools.ietf.org/html/rfc6335 Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | ffserver: deprecate Port and BindAddress options in favor of HTTPPort and ↵Stefano Sabatini2014-08-17
| | | | | | | | | | | | | | | | HTTPBindAddress The new option names are more explicit. Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | alacenc: fix extra bits extractionChristophe Gisquet2014-08-18
| | | | | | | | | | | | | | | | | | The raw coded bits are extracted prior to decorrelation, as is correctly performed by the decoder, and not after. Fixes ticket #2768. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | alacenc: increase predictor bufferChristophe Gisquet2014-08-18
| | | | | | | | | | | | | | This change is almost cosmetical only, and reduces the changes needed to fix the 24bps case. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxf: added ULs for demuxing avid media composer mxf filesMark Reid2014-08-18
| | | | | | | | | | | | The AAF SDK refers to these ULs as Legacy. These ULs are the same as the ones found in FFmbc's version of mxf.c and the ones found in libMXF Fixes Ticket#1554, Ticket#3100 and Ticket#3450
* | Merge commit '369380e1c4c6fc9b0d9ff04ec23d46b252ba7110'Michael Niedermayer2014-08-17
|\| | | | | | | | | | | | | * commit '369380e1c4c6fc9b0d9ff04ec23d46b252ba7110': mxf: Support AAC Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Support AACLuca Barbato2014-08-17
| | | | | | | | | | | | | | Update mxf_set_audio_pts to use the container-provided information. The UL is marked as "to be changed in the future", but the current samples in the wild do use it.
* | Merge commit '747cd9560c2248ff2834f29cd2190646330e4676'Michael Niedermayer2014-08-17
|\| | | | | | | | | | | | | * commit '747cd9560c2248ff2834f29cd2190646330e4676': mxf: Add the UL for the MPEG2VideoDescriptor Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Add the UL for the MPEG2VideoDescriptorLuca Barbato2014-08-17
| |
* | Merge commit '304089aca7d238ae184e09993b5c737aa22e2c2c'Michael Niedermayer2014-08-17
|\| | | | | | | | | | | | | * commit '304089aca7d238ae184e09993b5c737aa22e2c2c': mxf: Add UID print helpers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Add UID print helpersLuca Barbato2014-08-17
| | | | | | | | And use it to print non-parsed ULs.
* | Merge commit '11db644a8e54f02e54d2eaad343a87fcb697c15e'Michael Niedermayer2014-08-17
|\| | | | | | | | | | | | | * commit '11db644a8e54f02e54d2eaad343a87fcb697c15e': lavr: Update the planar check in ff_audio_convert Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: Update the planar check in ff_audio_convertLuca Barbato2014-08-17
| | | | | | | | | | | | Leftover from fbc0b8659967ea54a8472b5f795270d38bb085dd. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '96ce6d6f119a16e489941c629a2805204322b717'Michael Niedermayer2014-08-17
|\| | | | | | | | | | | | | | | | | | | * commit '96ce6d6f119a16e489941c629a2805204322b717': doc: Add more information in the README Conflicts: README.md Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: Add more information in the READMELuca Barbato2014-08-16
| | | | | | | | And convert it to Markdown.
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2014-08-17
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * cigaes/master: lavf/http: remove special case for cookies attributes. lavf/http: fix cookie parsing. Reviewed-by: Ronald S. Bultje Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf/http: remove special case for cookies attributes.Nicolas George2014-08-17
| | | | | | | | | | | | | | | With the previous change, unknown attributes are all ignored, as specified by the RFC.
| * | lavf/http: fix cookie parsing.Nicolas George2014-08-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current code would use any unknown attribute-value pair as the cookie value. RFC 6265 states that the first key-value pair is the actual cookie, and the attribute-value pairs only start after. With the current code: Set-Cookie: test=good_value; path=/; dummy=42 gives this: Cookie: dummy=42 instead of this with the new code: Cookie: test=good_value