mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
03b078721c
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88': doc: git-howto: Leave reviewers time to react before pushing patches Include libavutil/channel_layout.h instead of libavutil/audioconvert.h lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/git-howto.texi ffmpeg_filter.c libavcodec/flacdec.c libavcodec/imc.c libavcodec/mpegaudiodec.c libavcodec/utils.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffer.c libavutil/Makefile libavutil/audioconvert.h libavutil/channel_layout.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
decoding_encoding.c | ||
demuxing.c | ||
filtering_audio.c | ||
filtering_video.c | ||
Makefile | ||
metadata.c | ||
muxing.c | ||
README | ||
scaling_video.c |
FFmpeg examples README ---------------------- Both following use cases rely on pkg-config and make, thus make sure that you have them installed and working on your system. 1) Build the installed examples in a generic read/write user directory Copy to a read/write user directory and just use "make", it will link to the libraries on your system, assuming the PKG_CONFIG_PATH is correctly configured. 2) Build the examples in-tree Assuming you are in the source FFmpeg checkout directory, you need to build FFmpeg (no need to make install in any prefix). Then you can go into the doc/examples and run a command such as PKG_CONFIG_PATH=pc-uninstalled make.