summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '088f38a4f9f54bb923405c67c9e72d96d90aa284'Michael Niedermayer2013-05-01
|\ | | | | | | | | | | | | | | | | | | | | | | * commit '088f38a4f9f54bb923405c67c9e72d96d90aa284': avcodec: Drop unnecessary ff_ name prefixes from static functions Conflicts: libavcodec/ass.c libavcodec/h264_parser.c libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Drop unnecessary ff_ name prefixes from static functionsDiego Biurrun2013-04-30
| |
* | Merge commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f'Michael Niedermayer2013-05-01
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f': ppc: More consistent arch initialization Conflicts: libavcodec/fft.h libavcodec/mpegaudiodsp.c libavcodec/mpegaudiodsp.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ppc: More consistent arch initializationDiego Biurrun2013-04-30
| |
* | Merge commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf'Michael Niedermayer2013-05-01
|\| | | | | | | | | | | | | | | | | | | | | * commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf': fft: Remove pointless #ifdefs around function declarations ppc: Move AltiVec utility headers out of AltiVec ifdefs Conflicts: libavcodec/fft.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fft: Remove pointless #ifdefs around function declarationsDiego Biurrun2013-04-30
| |
| * ppc: Move AltiVec utility headers out of AltiVec ifdefsDiego Biurrun2013-04-30
| | | | | | | | | | Now that the headers themselves have ifdef protection this is no longer necessary and more consistent with normal include handling.
* | Merge commit 'f5eecee865a731d2412fde2f73c29f8f8115c499'Michael Niedermayer2013-05-01
|\| | | | | | | | | | | | | * commit 'f5eecee865a731d2412fde2f73c29f8f8115c499': ppc: util_altivec: Surround AltiVec-related code by appropriate ifdefs Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ppc: util_altivec: Surround AltiVec-related code by appropriate ifdefsDiego Biurrun2013-04-30
| | | | | | | | This prevents non-AltiVec-enabled compilers from choking.
* | Merge commit '6b110d3a739c31602b59887ad65c67025df3f49d'Michael Niedermayer2013-05-01
|\| | | | | | | | | | | | | | | * commit '6b110d3a739c31602b59887ad65c67025df3f49d': ppc: More consistent names for H.264 optimizations files mpegaudiosp: More consistent names for ppc/x86 optimization files Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ppc: More consistent names for H.264 optimizations filesDiego Biurrun2013-04-30
| |
| * mpegaudiosp: More consistent names for ppc/x86 optimization filesDiego Biurrun2013-04-30
| |
* | sws: share xyzgamma tables.Michael Niedermayer2013-05-01
| | | | | | | | | | | | | | | | They are currently always constant and thus theres no point to store them in the context. This makes the context 16kb smaller Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a'Michael Niedermayer2013-05-01
|\| | | | | | | | | | | | | | | | | | | | | * commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a': avconv: make output -ss insert trim/atrim filters. Conflicts: Changelog ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: make output -ss insert trim/atrim filters.Anton Khirnov2013-04-30
| | | | | | | | | | This makes output -ss sample-accurate for audio and will allow further simplication in the future.
* | Merge commit 'a83c0da539fb07260310bc3b34056239d2b138b2'Michael Niedermayer2013-05-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a83c0da539fb07260310bc3b34056239d2b138b2': avconv: make -t insert trim/atrim filters. The filter insertion code is merged but disabled as it is buggy. For example it fails in various ways when used with -s with some files. Also the trimming is arguably less accurate than the default without filters in some cases. These issues should be fixed before auto inserting the filters, until then the user can explicitly add a trim/atrim filter when one is wanted. Conflicts: Changelog ffmpeg.c ffmpeg_filter.c tests/ref/fate/bethsoft-vid tests/ref/lavf/aiff tests/ref/lavf/asf tests/ref/lavf/au tests/ref/lavf/avi tests/ref/lavf/dpx tests/ref/lavf/ffm tests/ref/lavf/gxf tests/ref/lavf/jpg tests/ref/lavf/mkv tests/ref/lavf/mmf tests/ref/lavf/mov tests/ref/lavf/mpg tests/ref/lavf/nut tests/ref/lavf/ogg tests/ref/lavf/pcx tests/ref/lavf/png tests/ref/lavf/rm tests/ref/lavf/ts tests/ref/lavf/voc tests/ref/lavf/voc_s16 tests/ref/lavf/wav Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: make -t insert trim/atrim filters.Anton Khirnov2013-04-30
| | | | | | | | | | | | | | | | | | This makes -t sample-accurate for audio and will allow further simplication in the future. Most of the FATE changes are due to audio now being sample accurate. In some cases a video frame was incorrectly passed with the old code, while its was over the limit.
* | avfilter/trim: improve rounding precissionMichael Niedermayer2013-05-01
| | | | | | | | | | | | | | | | Note, the design is still flawed, dont expect this to be frame accurate. float/double first needs to be removed and frames itself trimmed instead of drop vs nodrop Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate/pixfmts: use the appropriate variable names for temporary files.Clément Bœsch2013-05-01
| | | | | | | | | | | | | | ${1} is now the filter args and is inappropriate as a unique name for the test (and causes some FATE issues because of the ':' in them). ${filter} is not used either to replace the ${1} because ${outfile} already contains a unique name for the test.
* | Merge commit '3d624420086ed3cd0c74f4510f0285968e21c117'Michael Niedermayer2013-05-01
|\| | | | | | | | | | | | | | | | | | | * commit '3d624420086ed3cd0c74f4510f0285968e21c117': avconv_opt: allocate an OutputFile before the streams. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv_opt: allocate an OutputFile before the streams.Anton Khirnov2013-04-30
| | | | | | | | | | This way OutputFile variables like recording time can be used when creating the streams.
* | Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'Michael Niedermayer2013-05-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876': lavfi: add trim and atrim filters. Conflicts: Changelog doc/filters.texi libavfilter/Makefile libavfilter/allfilters.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: add trim and atrim filters.Anton Khirnov2013-04-30
| |
* | Merge commit 'b472938233b98178ed6c1353c37e0dc7ab585902'Michael Niedermayer2013-05-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b472938233b98178ed6c1353c37e0dc7ab585902': lavfi: add an asetpts filter Conflicts: Changelog doc/filters.texi libavfilter/Makefile libavfilter/allfilters.c libavfilter/f_setpts.c libavfilter/setpts.c libavfilter/version.h libavfilter/vf_setpts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: add an asetpts filterAnton Khirnov2013-04-30
| |
* | Merge commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0'Michael Niedermayer2013-05-01
|\| | | | | | | | | | | | | | | | | | | * commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0': vf_setpts: cosmetics, reformat Conflicts: libavfilter/f_setpts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_setpts: cosmetics, reformatAnton Khirnov2013-04-30
| |
* | Merge commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8'Michael Niedermayer2013-05-01
|\| | | | | | | | | | | | | | | * commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8': graphparser: only print filter arguments if they are non-NULL af_channelmap: ensure the output channel layout is valid. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * graphparser: only print filter arguments if they are non-NULLAnton Khirnov2013-04-30
| |
| * af_channelmap: ensure the output channel layout is valid.Anton Khirnov2013-04-30
| |
* | Merge commit '949c603ed9210df0e1b8e1aa82c71b93543d8071'Michael Niedermayer2013-05-01
|\| | | | | | | | | | | | | | | | | | | | | * commit '949c603ed9210df0e1b8e1aa82c71b93543d8071': af_channelmap: remove now unnecessary goto vf_split: fix description Conflicts: libavfilter/split.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_channelmap: remove now unnecessary gotoAnton Khirnov2013-04-30
| | | | | | | | | | Options are freed from the generic code now, there is no need to call av_opt_free() from the filter.
| * vf_split: fix descriptionAnton Khirnov2013-04-30
| | | | | | | | It now allows an arbitrary number of inputs, not just two.
* | Merge commit 'e036bb7899d0faca9159206be9bf5552e76e7633'Michael Niedermayer2013-05-01
|\| | | | | | | | | | | | | | | * commit 'e036bb7899d0faca9159206be9bf5552e76e7633': lavc: clear AVBuffers on decoded frames if refcounted_frames is not set FATE: add an additional indeo3 test Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: clear AVBuffers on decoded frames if refcounted_frames is not setAnton Khirnov2013-04-30
| | | | | | | | | | Otherwise some code might mistakenly think it is allowed to unref those buffers, which would lead to double unref.
| * FATE: add an additional indeo3 testAnton Khirnov2013-04-30
| | | | | | | | It is a part of the sample that got broken by recent indeo3 changes.
* | Merge commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61'Michael Niedermayer2013-05-01
|\| | | | | | | | | | | | | | | | | | | * commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61': indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell() Conflicts: libavcodec/indeo3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell()Anton Khirnov2013-04-30
| | | | | | | | | | They are the same in this case, except put_pixels also has blocksizes smaller than 8.
* | Merge commit '95220be1faac628d849a004644c0d102df0aa98b'Michael Niedermayer2013-05-01
|\| | | | | | | | | | | | | * commit '95220be1faac628d849a004644c0d102df0aa98b': indeo3: fix off by one in MV validity check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo3: fix off by one in MV validity checkAnton Khirnov2013-04-30
| | | | | | | | CC:libav-stable@libav.org
* | doc/filters: fix scale example equivalence.Clément Bœsch2013-05-01
| | | | | | | | scale=w=200:h=100 and scale=w=200:h=100 are of course equivalent...
* | doc/filters: replace hqdn3d with smartblur in timeline section.Clément Bœsch2013-05-01
| | | | | | | | | | hqdn3d needs some adjustements before timeline support can be restored (patch welcome).
* | h264: Use the correct croping values.Michael Niedermayer2013-05-01
| | | | | | | | | | | | | | This fixes returning pictures with corrupted data pointers. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: assert that croping values at slice level are consistentMichael Niedermayer2013-04-30
| | | | | | | | | | | | These values where checked before already. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264_ps: check croping valuesMichael Niedermayer2013-04-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/log: Fix context pointer used for get_category()Michael Niedermayer2013-04-30
| | | | | | | | | | | | | | Fixes calling a random pointer Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | gif: Fix little endian specific codeMichael Niedermayer2013-04-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | framecrcenc: workaround design flaw in sidedata paletteMichael Niedermayer2013-04-30
| | | | | | | | | | | | | | This should be reverted once palettes are dealt with in a endian independant way in packets Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: add test for separatefields filterPaul B Mahol2013-04-30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | fate: add test for swapuv filterPaul B Mahol2013-04-30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-16 14:29:09 +0000