summaryrefslogtreecommitdiffstats
path: root/.gitignore
Commit message (Collapse)AuthorAgeFilesLines
* tools/python: add script to convert TensorFlow model (.pb) to native model ↵Guo, Yejun2019-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | (.model) For example, given TensorFlow model file espcn.pb, to generate native model file espcn.model, just run: python convert.py espcn.pb In current implementation, the native model file is generated for specific dnn network with hard-code python scripts maintained out of ffmpeg. For example, srcnn network used by vf_sr is generated with https://github.com/HighVoltageRocknRoll/sr/blob/master/generate_header_and_model.py#L85 In this patch, the script is designed as a general solution which converts general TensorFlow model .pb file into .model file. The script now has some tricky to be compatible with current implemention, will be refined step by step. The script is also added into ffmpeg source tree. It is expected there will be many more patches and community needs the ownership of it. Another technical direction is to do the conversion in c/c++ code within ffmpeg source tree. While .pb file is organized with protocol buffers, it is not easy to do such work with tiny c/c++ code, see more discussion at http://ffmpeg.org/pipermail/ffmpeg-devel/2019-May/244496.html. So, choose the python script. Signed-off-by: Guo, Yejun <yejun.guo@intel.com>
* Remove the ffserver programRostislav Pehlivanov2018-01-061-1/+0
| | | | Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* build: add support for building .cu files via nvccTimo Rothenpieler2017-05-151-0/+2
| | | | Original work by Yogender Gupta <ygupta@nvidia.com>
* build: Ignore generated .version filesDiego Biurrun2017-05-071-0/+1
| | | | | (cherry picked from commit 740b0bf03b4bb8b0a0e964750817ac0363a33c55) Signed-off-by: James Almer <jamrial@gmail.com>
* Merge commit '11a9320de54759340531177c9f2b1e31e6112cc2'Clément Bœsch2017-05-031-1/+2
|\ | | | | | | | | | | | | | | | | * commit '11a9320de54759340531177c9f2b1e31e6112cc2': build: Move build-system-related helper files to a separate subdirectory "ffbuild" directory name is used instead of "avbuild". Merged-by: Clément Bœsch <u@pkh.me>
| * build: Move build-system-related helper files to a separate subdirectoryDiego Biurrun2016-12-221-1/+2
| | | | | | | | This unclutters the top-level directory and groups related files together.
* | Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1'Hendrik Leppkes2016-06-261-0/+1
|\ \ | |/ | | | | | | | | | | * commit '6641819feedb086ebba3d2be89b8d33980f367e1': build: Ignore generated mapfile and remove it on distclean Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * build: Ignore generated mapfile and remove it on distcleanDiego Biurrun2016-05-271-0/+1
| |
* | Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196'Clément Bœsch2016-06-221-1/+0
|\ \ | |/ | | | | | | | | | | * commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196': tests: Move all test programs to a subdirectory Merged-by: Clément Bœsch <clement@stupeflix.com>
| * tests: Move all test programs to a subdirectoryDiego Biurrun2016-05-131-1/+0
| |
* | Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801'Clément Bœsch2016-06-221-64/+0
|\ \ | |/ | | | | | | | | | | * commit '257f00ec1ab06a2a161f535036c6512f3fc8e801': Split global .gitignore file into per-directory files Merged-by: Clément Bœsch <clement@stupeflix.com>
| * Split global .gitignore file into per-directory filesDiego Biurrun2016-05-131-37/+1
| |
* | Merge commit '06edef3d5e072ef3c4face9ce946d2d9c36cc477'Derek Buitenhuis2016-05-121-0/+2
|\ \ | |/ | | | | | | | | | | * commit '06edef3d5e072ef3c4face9ce946d2d9c36cc477': Generate the lists of enabled protocols/bsfs from configure. Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * Generate the lists of enabled protocols/bsfs from configure.Anton Khirnov2016-04-191-0/+2
| |
* | Merge commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7'Derek Buitenhuis2016-04-171-1/+0
|\ \ | |/ | | | | | | | | | | * commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7': doc: Update paths to match new examples location Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * doc: Update paths to match new examples locationDiego Biurrun2016-03-231-1/+0
| |
* | fate: add audiomatchMichael Niedermayer2016-03-221-0/+1
| | | | | | | | | | Testset provided by Justin Greer <justin@zencoder.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | build: use a link instead of changing current directory when compilingAndreas Cadhalpun2016-01-251-0/+1
| | | | | | | | | | | | | | | | | | | | If links don't work, fall back to using the full source path as was previously done. This should fix build failures with MSVC. Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | gitignore: ignore object file temporariesGanesh Ajjanagadde2015-10-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During a build, a lot of *.o.-hash files are created - had not noticed this as they are usually dumped in tmpfs on Linux. However, they sometimes are present during a long build in the project directory, making it annoying to commit while the project is being built. These have been observed with Clang, -fsanitize-undefined on Arch Linux, though other configurations may also generate such temporaries. The solution here is on lines with the Linux kernel's .gitignore: https://github.com/torvalds/linux/blob/master/.gitignore. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | .gitignore: ignore temp filesHarshit Mittal2015-09-101-0/+2
| | | | | | | | Github: Closes #144
* | doc/examples: rename avio_list_dir -> avio_dir_cmdMariusz Szczepańczyk2015-08-161-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '8bc67ec2c0d2b5444d51a1bed1d50f0e10d92717'Michael Niedermayer2015-07-121-0/+1
|\ \ | |/ | | | | | | | | | | * commit '8bc67ec2c0d2b5444d51a1bed1d50f0e10d92717': Checkasm: assembly testing and benchmarking tool Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * Checkasm: assembly testing and benchmarking toolHenrik Gramner2015-07-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It provides the following features: * verify correctness by comparing output to the C version. * detect failure to save and restore clobbered callee-saved registers. * detect 32-bit parameters being used as if they were 64-bit in x86-64 (the upper halves are not guaranteed to be zero - but in practice they very often are, which makes those bugs hard to spot otherwise). * easy benchmarking. Compile by running 'make checkasm'. Execute by running 'tests/checkasm/checkasm'. Optional arguments are '--bench' to run benchmarks for all functions, '--bench=<pattern>' to run benchmarks for all functions that starts with <pattern>, and '<integer>' to seed the PRNG for reproducible results. Contains unit tests for most h264pred functions to get started, more tests can be added afterwards using those as a reference. Loosely based on code from x264. Currently only supports x86 and x86-64, but additional architectures shouldn't be too much of an obstacle to add. Note that functions with floating point parameters or floating point return values are not supported. Some compiler-specific features or preprocessor hacks would likely be required to add support for that. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | Merge commit '1316df7aa98c4784f190d107206d0bb12c590b89'Michael Niedermayer2015-07-031-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1316df7aa98c4784f190d107206d0bb12c590b89': lavu: add an API function to return the Libav version string Conflicts: .gitignore Makefile cmdutils.c doc/APIchanges libavutil/avutil.h libavutil/utils.c See: f91126643a91c2d3f8d8e210c8facaf259951b03 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: add an API function to return the Libav version stringwm42015-07-021-1/+1
| | | | | | | | | | | | | | | | This returns something like "v12_dev0-1332-g333a27c". This is much more useful than the individual library versions, of which there are too many, and which are very hard to map back to releases or git commits. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | doc/examples: add directory listing exampleLukasz Marek2015-03-281-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '11e05533170485b593974cf90916425a0188e7bd'Michael Niedermayer2015-02-021-0/+1
|\ \ | |/ | | | | | | | | | | * commit '11e05533170485b593974cf90916425a0188e7bd': Ignore generated file tools/sidxindex. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Ignore generated file tools/sidxindex.Diego Biurrun2015-02-021-0/+1
| |
* | gitignore: add test_copy.ffmetaBenoit Fouet2014-10-171-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: export motion vectors in frame side data on demandClément Bœsch2014-08-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d'Michael Niedermayer2014-08-011-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '706208ef47bffd525c982975d2756f7b2b220b8d': fate: Split fate-pixdesc tests and dispatch them through Make Conflicts: tests/fate-run.sh tests/ref/fate/filter-pixdesc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Split fate-pixdesc tests and dispatch them through MakeDiego Biurrun2014-08-011-0/+1
| | | | | | | | This allows running all the tests individually and/or in parallel.
| * Remove avserver.Anton Khirnov2014-06-181-1/+0
| | | | | | | | | | | | | | It has not been properly maintained for years and there is little hope of that changing in the future. It appears simpler to write a new replacement from scratch than unbreaking it.
* | gitignore: add examples/transcodingLukasz Marek2014-07-101-0/+1
| | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '766f2d965ff1948749c37f26a714adb8aa89c4a9'Michael Niedermayer2014-06-161-0/+1
|\ \ | |/ | | | | | | | | | | * commit '766f2d965ff1948749c37f26a714adb8aa89c4a9': gitignore: add dylib and swp entries Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * gitignore: add dylib and swp entriesVittorio Giovara2014-06-161-0/+2
| |
* | gitignore: add tools/uncoded_frameLukasz Marek2014-05-061-0/+1
| | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | examples: rename avcodec.c to decoding_encoding.cStefano Sabatini2014-04-231-1/+1
| | | | | | | | | | Restore the old name, which was more meaningful and consistent with the names of the other examples.
* | Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'Michael Niedermayer2014-02-251-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a': libavfilter: example audio filtering program Conflicts: .gitignore configure doc/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavfilter: example audio filtering programAnton Khirnov2014-02-251-0/+1
| | | | | | | | | | | | Based on a patch by Andrew Kelley <superjoe30@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '294a51e18ab7df4d658249361a03f0d716a4e9f0'Michael Niedermayer2014-02-191-3/+1
|\ \ | |/ | | | | | | | | | | * commit '294a51e18ab7df4d658249361a03f0d716a4e9f0': gitignore: Add all examples below doc/examples Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * gitignore: Add all examples below doc/examplesDiego Biurrun2014-02-191-0/+2
| |
* | Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'Michael Niedermayer2014-02-171-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90': Move all example programs to doc/examples Conflicts: configure doc/Makefile doc/doxy-wrapper.sh doc/examples/avcodec.c doc/examples/decoding_encoding.c doc/examples/metadata.c doc/examples/muxing.c doc/examples/transcode_aac.c libavcodec/Makefile libavcodec/api-example.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | examples: add avio_reading.c exampleStefano Sabatini2014-02-021-0/+1
| |
* | examples: add remuxing exampleStefano Sabatini2014-01-201-0/+1
| | | | | | | | Show how to perform streamcopy from one container to another.
* | Merge commit '3cd612d44789948f72b52944474e0870c5c60964'Michael Niedermayer2013-12-011-0/+2
|\ \ | |/ | | | | | | | | | | * commit '3cd612d44789948f72b52944474e0870c5c60964': gitignore: Ignore multilibrary example programs Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * gitignore: Ignore multilibrary example programsDiego Biurrun2013-12-011-0/+2
| |
* | build: rename version.h to libavutil/ffversion.hTimothy Gu2013-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also the libavutil/ffversion.h will be installed. Rationale: * Applications might want to know FFmpeg's version besides the individual libraries'. * Avoids file name clash between FFmpeg's ./version.h and lib*/version.h when a library source file includes both and is compiled on an out-of-tree build. Fixes #1769. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add transcode_aac example to .gitignore.Clément Bœsch2013-11-281-0/+1
| |
* | doc/examples: rename demuxing to demuxing_decoding.Clément Bœsch2013-11-041-1/+1
| | | | | | | | | | That example shows how the decoding process works, not only the demuxing.
OpenPOWER on IntegriCloud