History

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

* 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

Michael Niedermayer committed 14 years ago

Commit 03b07872 parents da501ea 97bf7c084 files · +323 −319Browse files

Showing the changes to doc/examples/decoding_encoding.c (1 of 84 files). Show all

Unified · Split

doc/examples/decoding_encoding.c+1−1
@@ -34,7 +34,7 @@ · 33 unmodified lines
3434
3535 #include <libavutil/opt.h>
3636 #include <libavcodec/avcodec.h>
37−#include <libavutil/audioconvert.h>
37+#include <libavutil/channel_layout.h>
3838 #include <libavutil/common.h>
3939 #include <libavutil/imgutils.h>
4040 #include <libavutil/mathematics.h>

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t