aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avformat/concatdec: avoid NULL dereference when failed to open file.Zhang Rui2015-01-291-0/+3
| | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '6996fd204a7f28b46a8c3c97bcf223998218c743'Michael Niedermayer2015-01-291-1/+1
|\ | | | | | | | | | | | | * commit '6996fd204a7f28b46a8c3c97bcf223998218c743': libopenh264: Log debug messages to a non-null context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libopenh264: Log debug messages to a non-null contextMartin Storsjö2015-01-291-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | examples/filtering: extend comments about setting the filter graph endpointsStefano Sabatini2015-01-292-2/+34
| | | | | | | | | | That part is a constant source of confusions for readers, this should help clarify the apparently inverted logic.
* | lavfi: document assumptions about the input and output labels of a filter ↵Stefano Sabatini2015-01-292-0/+8
| | | | | | | | graph description
* | doc/filters: apply some updates to the Filtergraph syntax sectionStefano Sabatini2015-01-291-4/+5
| |
* | Fix frame-alignment in PP7Arwa Arif2015-01-291-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2015-01-295-9/+14
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Add an ARES atom to extradata when encoding avui. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Add an ARES atom to extradata when encoding avui.Carl Eugen Hoyos2015-01-295-9/+14
| | | | | | | | | | | | | | | | | | Allows playback with QuickTime and the original codec. Tested by Olaf Matthes, olaf matthes gmx de
* | | libavutil: Added twofish symmetric block cipherSupraja Meedinti2015-01-294-0/+449
|/ / | | | | | | | | | | Signed-off-by: Supraja Meedinti <supraja0493@gmail.com> Reviewed-by: Giorgio Vazzana <mywing81@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '61928b68dc28e080b8c8191afe5541123c682bbd'Michael Niedermayer2015-01-281-2/+2
|\| | | | | | | | | | | | | | | | | | | | | * commit '61928b68dc28e080b8c8191afe5541123c682bbd': h264: Do not share rbsp_buffer across threads Conflicts: libavcodec/h264.c See: ecbf838c7d81ebd3b89fe75d83ff29150dbda27a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Do not share rbsp_buffer across threadsMichael Niedermayer2015-01-281-0/+4
| | | | | | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org> CC: libav-stable@libav.org
* | avformat/aviobuf: Allow seeking to the end of the buffer for read only buffersMichael Niedermayer2015-01-281-1/+1
| | | | | | | | | | | | This undoes the effect of 3c18a7b18807de81566381a1bcbe9f6103c0296b for reading Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3c18a7b18807de81566381a1bcbe9f6103c0296b'Michael Niedermayer2015-01-281-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '3c18a7b18807de81566381a1bcbe9f6103c0296b': avio: Do not consider the end-of-buffer position valid Conflicts: libavformat/aviobuf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: Do not consider the end-of-buffer position validLuca Barbato2015-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Trigger a refill if the seek action moves the pointer at the end of the buffer. Before this patch the read action following the seek would trigger the refill, while write action would write outside the buffer. In the Libav codebase few muxers seek forward outside of what already has been written so it is quite unlikely to experience the problem with the default buffer size. CC: libav-stable@libav.org
* | Merge commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff'Michael Niedermayer2015-01-281-0/+1
|\| | | | | | | | | | | | | * commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff': libdc1394: Add support for MONO8 (gray) video mode Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libdc1394: Add support for MONO8 (gray) video modeClay McClure2015-01-281-0/+1
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/nsvdec: remove case which is no longer possiblePaul B Mahol2015-01-281-4/+1
| | | | | | | | | | | | Check of channels !=0 is right above. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/x86/vf_fspp: Fix loop condition for column_fidct()Michael Niedermayer2015-01-281-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_fspp: check count before calling row_idct()Michael Niedermayer2015-01-281-1/+2
| | | | | | | | | | | | Fixes crash with odd widths Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_fspp: Fix frame-alignment in FSPPArwa Arif2015-01-281-0/+2
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_colorchannelmixer: use the name 's' for the pointer to the ↵Paul B Mahol2015-01-281-90/+90
| | | | | | | | | | | | private context Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/avf_avectorscope: use the name 's' for the pointer to the private ↵Paul B Mahol2015-01-281-46/+46
| | | | | | | | | | | | context Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/af_biquads: use the name 's' for the pointer to the private contextPaul B Mahol2015-01-281-105/+105
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/vf_extractplanes: use the name 's' for the pointer to the private ↵Paul B Mahol2015-01-281-20/+20
| | | | | | | | | | | | context Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfitler/vf_il: use the name 's' for the pointer to the private contextPaul B Mahol2015-01-281-15/+15
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/vf_colorbalance: use the name 's' for the pointer to the private ↵Paul B Mahol2015-01-281-24/+24
| | | | | | | | | | | | context Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/vf_telecine: use the name 's' for the pointer to the private contextPaul B Mahol2015-01-281-55/+55
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avutil/aes: Rename crypt()Michael Niedermayer2015-01-281-3/+3
| | | | | | | | | | | | | | This avoids a potential conflict with the equally named function from XOPEN It also could reduce confusion in debugger backtraces Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264_parser: Rename close()Michael Niedermayer2015-01-281-2/+2
| | | | | | | | | | | | | | This avoids a potential conflict with the equally named function for closing files It also could reduce confusion in debugger backtraces Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/fftools-common-opts: update/extend documentation for -opencl_bench optionManeesh Gupta2015-01-281-2/+35
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | avcodec/nvenc: Handle non-square pixel aspect ratiosTimo Rothenpieler2015-01-281-2/+15
| | | | | | | | | | Reviewed-by: Philip Langdale <philipl@overt.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tests/fate: added mxf tests for essencegroups and missing indexMark Reid2015-01-284-0/+15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: Fix cleanup in mxf_free_metadataset()Carl Eugen Hoyos2015-01-281-5/+6
| | | | | | | | | | | | | | Fixes Ticket4256 Found-by: tholin Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_mcdeint: avoid uninitilaized fields in AVPacketMichael Niedermayer2015-01-281-3/+1
| | | | | | | | | | | | This is also simpler Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample_internal.h: Move struct declaration before first use.Reimar Döffinger2015-01-271-21/+21
| | | | | | | | | | | | | | It seems more logical and works with more restricted C compilers like tinycc. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Support BMP files that do not properly align lines.Reimar Döffinger2015-01-271-3/+7
| | | | | | | | | | | | | | | | | | Quite a few programs missed that detail of the spec (including old versions of FFmpeg I believe) and when we would otherwise fail anyway it seems worth a try to use a simple byte-aligned stride instead. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit '8805589b803fab5f362008306319336ac79a3fa7'Michael Niedermayer2015-01-271-8/+14
|\| | | | | | | | | | | | | * commit '8805589b803fab5f362008306319336ac79a3fa7': libopencv: Rework error handling in parse_iplconvkernel() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libopencv: Rework error handling in parse_iplconvkernel()Vittorio Giovara2015-01-271-8/+14
| | | | | | | | | | | | | | Fix 'values' memory leak in case of error. CC: libav-stable@libav.org Bug-Id: CID 739879
* | Merge commit '607ad990d31e6be52980970e5ce8cd25ab3de812'Michael Niedermayer2015-01-271-23/+40
|\| | | | | | | | | | | | | | | | | | | * commit '607ad990d31e6be52980970e5ce8cd25ab3de812': dvbsubdec: check memory allocations and propagate errors Conflicts: libavcodec/dvbsubdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dvbsubdec: check memory allocations and propagate errorsVittorio Giovara2015-01-271-30/+58
| |
* | Merge commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52'Michael Niedermayer2015-01-271-0/+5
|\| | | | | | | | | | | | | * commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52': nuv: validate image size Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nuv: validate image sizeVittorio Giovara2015-01-271-0/+5
| | | | | | | | | | | | | | Avoid a division by zero. CC: libav-stable@libav.org Bug-Id: CID 717750
* | Merge commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6'Michael Niedermayer2015-01-271-0/+2
|\| | | | | | | | | | | | | | | * commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6': nsvdec: validate channels and samplerate See: d633e15d7d939f532326e2bc92097b12eba4d5ae Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nsvdec: validate channels and samplerateVittorio Giovara2015-01-271-0/+2
| | | | | | | | | | | | | | Avoid a division by zero. CC: libav-stable@libav.org Bug-Id: CID 717749
* | Merge commit 'a536a4e4bc52d05f59869761337452fb1f1977f6'Michael Niedermayer2015-01-271-0/+7
|\| | | | | | | | | | | | | * commit 'a536a4e4bc52d05f59869761337452fb1f1977f6': lavc: support extracting audio service type from side data Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: support extracting audio service type from side dataAnton Khirnov2015-01-271-0/+7
| |
* | Merge commit '32125781487411ed3b1b28b32063d6cd4024d4fc'Michael Niedermayer2015-01-271-4/+20
|\| | | | | | | | | | | | | * commit '32125781487411ed3b1b28b32063d6cd4024d4fc': mov: export audio service type as side data Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: export audio service type as side dataAnton Khirnov2015-01-271-4/+20
| |
* | Merge commit '4227e4fe7443733fb906f6fb6c265105e8269c74'Michael Niedermayer2015-01-273-23/+47
|\| | | | | | | | | | | | | | | | | | | | | * commit '4227e4fe7443733fb906f6fb6c265105e8269c74': lavf: add a convenience function for adding side data to a stream Conflicts: libavformat/internal.h libavformat/replaygain.c Merged-by: Michael Niedermayer <michaelni@gmx.at>