summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | vf_idet: remove some unnecessary statement and unused variableMatthieu Bouron2012-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | takdec: fix seekingPaul B Mahol2012-10-10
| | | | | | | | | | | | The previous approach was just wrong. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: sanitize linking of tools and test programs fate: Refactor setting of environment variables for groups of tests Conflicts: tests/fate/audio.mak tests/fate/real.mak tests/fate/voice.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: sanitize linking of tools and test programsMans Rullgard2012-10-10
| | | | | | | | | | | | | | | | | | This makes sure proper linker arguments are used for the tools and test programs when shared libraries are enabled. The tools are linked using the usual -l flag while for test programs the full name of the static library is used. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * fate: Refactor setting of environment variables for groups of testsDiego Biurrun2012-10-10
| |
* | Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702'Michael Niedermayer2012-10-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702': swscale: Do not make ff_ symbols globally visible. rtspdec: use av_strlcpy for writing into fixed size buffer g722enc: fix size argument in memset http: use av_strlcpy instead of strcpy() without size checks avfilter: correct memcpy size avfilter_copy_buf_props() lavc: split asv12 encoder/decoder Conflicts: libavcodec/asvdec.c libavfilter/buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: Do not make ff_ symbols globally visible.Diego Biurrun2012-10-10
| |
| * rtspdec: use av_strlcpy for writing into fixed size bufferJanne Grunau2012-10-09
| | | | | | | | Fixes CID231347.
| * g722enc: fix size argument in memsetJanne Grunau2012-10-09
| | | | | | | | Fixes CID700725.
| * http: use av_strlcpy instead of strcpy() without size checksJanne Grunau2012-10-09
| | | | | | | | Fixes CID700730.
| * avfilter: correct memcpy size avfilter_copy_buf_props()Janne Grunau2012-10-09
| | | | | | | | | | Does not make a difference in this case since sizeof(uint8_t*) == sizeof(uint8_t**). Fixes CID703814.
| * lavc: split asv12 encoder/decoderAnton Khirnov2012-10-09
| |
* | Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'Michael Niedermayer2012-10-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2': avconv: remove -same_quant Conflicts: Changelog doc/faq.texi ffmpeg.c ffmpeg.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: remove -same_quantAnton Khirnov2012-10-09
| | | | | | | | | | | | | | It has not worked for anything other than fringe codecs (asv1/2, mdec, mjpeg[b]) since about 2003 and nobody ever noticed or complained. This sufficiently proves that there are no users of this option who have a clue of what they are doing, so it is completely useless.
* | dtshd: remove redundant/wrong avio_tell()Paul B Mahol2012-10-10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | takdec: remove redundant/wrong avio_tell()Paul B Mahol2012-10-10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a'Michael Niedermayer2012-10-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a': cmdutils_read_file: increment *size after writing the trailing \0 af_resample: unref out_buf when avresample_convert returns 0 af_amix: prevent memory leak on error path vc1dec: prevent memory leak in error path vc1dec: prevent memory leak on av_realloc error af_channelmap: free old extended_data on reallocation avconv: simplify memory allocation in copy_chapters matroskaenc: check cue point validity before reallocation swfenc: error out for more than 1 audio or video stream build: link test programs only against static libs Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils_read_file: increment *size after writing the trailing \0Janne Grunau2012-10-09
| | | | | | | | Fixes CID732166.
| * af_resample: unref out_buf when avresample_convert returns 0Janne Grunau2012-10-09
| | | | | | | | Fixes CID732273.
| * af_amix: prevent memory leak on error pathJanne Grunau2012-10-09
| | | | | | | | Fixes CID732272.
| * vc1dec: prevent memory leak in error pathJanne Grunau2012-10-09
| | | | | | | | Fixes CID732271.
| * vc1dec: prevent memory leak on av_realloc errorJanne Grunau2012-10-09
| |
| * af_channelmap: free old extended_data on reallocationJanne Grunau2012-10-09
| | | | | | | | | | Prevents writes to freed memory and the leak of the old extended data. Fixes CID732303.
| * avconv: simplify memory allocation in copy_chaptersJanne Grunau2012-10-09
| | | | | | | | | | | | | | | | | | Make just a single reallocation per call instead of one reallocation per copied chapters. This fixes possible memory leaks on realloc failures. Also correct the allocation since it needs multiples of sizeof(AVChapter*) and not sizeof(AVChapter). Fixes CID700633 and CID700719.
| * matroskaenc: check cue point validity before reallocationJanne Grunau2012-10-09
| | | | | | | | | | Prevents memory leak and possible access to freed memory. Fixes CID605744.
| * swfenc: error out for more than 1 audio or video streamJanne Grunau2012-10-09
| | | | | | | | Prevents CID602000.
| * build: link test programs only against static libsMans Rullgard2012-10-09
| | | | | | | | | | | | | | | | | | | | The test programs use internal symbols so cannot be linked against the shared libs. Linking against both shared and static is pointless and might do something strange depending on the linker. This changes the dependencies so the test programs are linked only against the static library for the component they belong to. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f'Michael Niedermayer2012-10-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f': adxdec: use planar sample format adpcmdec: use planar sample format for adpcm_thp adpcmdec: use planar sample format for adpcm_ea_xas adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3 adpcmdec: use planar sample format for adpcm_xa adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3 adpcmdec: use planar sample format for adpcm_4xm adpcmdec: use planar sample format for adpcm_ima_wav adpcmdec: use planar sample format for adpcm_ima_qt pcmdec: use planar sample format for pcm_lxf mace: use planar sample format atrac1: use planar sample format build: non-x86: Only compile mpegvideo optimizations when necessary rtpdec_mpeg4: au_headers is a single array, simple av_free is enough avcodec: free extended_data instead address of it fate: Add tests of the ff_make_absolute_url function url: Handle relative urls starting with two slashes url: Handle relative urls being just a new query string url: Don't treat slashes in query parameters as directory separators Conflicts: libavcodec/adxdec.c libavcodec/mips/Makefile libavcodec/pcm.c libavcodec/utils.c libavformat/Makefile libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adxdec: use planar sample formatJustin Ruggles2012-10-09
| |
| * adpcmdec: use planar sample format for adpcm_thpJustin Ruggles2012-10-09
| |
| * adpcmdec: use planar sample format for adpcm_ea_xasJustin Ruggles2012-10-09
| |
| * adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3Justin Ruggles2012-10-09
| |
| * adpcmdec: use planar sample format for adpcm_xaJustin Ruggles2012-10-09
| |
| * adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3Justin Ruggles2012-10-09
| |
| * adpcmdec: use planar sample format for adpcm_4xmJustin Ruggles2012-10-09
| |
| * adpcmdec: use planar sample format for adpcm_ima_wavJustin Ruggles2012-10-09
| |
| * adpcmdec: use planar sample format for adpcm_ima_qtJustin Ruggles2012-10-09
| |
| * pcmdec: use planar sample format for pcm_lxfJustin Ruggles2012-10-09
| |
| * mace: use planar sample formatJustin Ruggles2012-10-09
| |
| * atrac1: use planar sample formatJustin Ruggles2012-10-09
| |
| * build: non-x86: Only compile mpegvideo optimizations when necessaryDiego Biurrun2012-10-09
| |
| * rtpdec_mpeg4: au_headers is a single array, simple av_free is enoughJanne Grunau2012-10-09
| | | | | | | | Fixes CID700204.
| * avcodec: free extended_data instead address of itJanne Grunau2012-10-09
| | | | | | | | Fixes CID732173.
| * fate: Add tests of the ff_make_absolute_url functionMartin Storsjö2012-10-09
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * url: Handle relative urls starting with two slashesDuncan Salerno2012-10-09
| | | | | | | | | | | | This is defined by RFC 3986 section 5.4.1 to be handled this way. Signed-off-by: Martin Storsjö <martin@martin.st>
| * url: Handle relative urls being just a new query stringDuncan Salerno2012-10-09
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * url: Don't treat slashes in query parameters as directory separatorsDuncan Salerno2012-10-09
| | | | | | | | | | | | | | Strip off query parameters from the original url before applying the new relative path. Signed-off-by: Martin Storsjö <martin@martin.st>
* | pcx: use meaningful return valuesPaul B Mahol2012-10-10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | x86/dsputil_mmx: change assert() to av_assert()Michael Niedermayer2012-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | crypto should allow passing of options to the underlying protocol via the ↵Duncan Salerno2012-10-09
| | | | | | | | | | | | url_open2 interface Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 21:40:13 +0000