* 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
Showing the changes to doc/examples/decoding_encoding.c (1 of 84 files). Show all
Unified · Split
| @@ -34,7 +34,7 @@ · 33 unmodified lines | |||
| 34 | 34 | ||
| 35 | #include <libavutil/opt.h> | 35 | #include <libavutil/opt.h> |
| 36 | #include <libavcodec/avcodec.h> | 36 | #include <libavcodec/avcodec.h> |
| 37 | #include <libavutil/audioconvert.h> | 37 | #include <libavutil/channel_layout.h> |
| 38 | #include <libavutil/common.h> | 38 | #include <libavutil/common.h> |
| 39 | #include <libavutil/imgutils.h> | 39 | #include <libavutil/imgutils.h> |
| 40 | #include <libavutil/mathematics.h> | 40 | #include <libavutil/mathematics.h> |