History

Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h

Also remove it in once case when it is not needed.

Paul B Mahol committed 14 years ago

Commit 1acd2f61 parent e97a24130 files · +31 −32Browse files

Unified · Split

30 files
  1. doc/filters.texi +3 −3
  2. libavcodec/dcaenc.c +1 −1
  3. libavcodec/vima.c +1 −1
  4. libavdevice/lavfi.c +1 −1
  5. libavfilter/af_aconvert.c +1 −1
  6. libavfilter/af_amerge.c +1 −1
  7. libavfilter/af_aresample.c +1 −1
  8. libavfilter/af_asetnsamples.c +1 −1
  9. libavfilter/af_atempo.c +1 −1
  10. libavfilter/af_earwax.c +1 −1
  11. libavfilter/af_pan.c +1 −1
  12. libavfilter/af_silencedetect.c +1 −1
  13. libavfilter/af_volume.c +1 −1
  14. libavfilter/af_volumedetect.c +1 −1
  15. libavfilter/asrc_aevalsrc.c +1 −1
  16. libavfilter/asrc_flite.c +1 −1
  17. libavfilter/avf_concat.c +1 −1
  18. libavfilter/avf_showspectrum.c +1 −1
  19. libavfilter/avf_showwaves.c +1 −1
  20. libavfilter/f_ebur128.c +1 −1
  21. libavfilter/formats.c +1 −1
  22. libavfilter/graphdump.c +1 −1
  23. libavfilter/sink_buffer.c +1 −1
  24. libavfilter/src_buffer.c +1 −1
  25. libswresample/audioconvert.h +0 −1
  26. libswresample/rematrix.c +1 −1
  27. libswresample/swresample-test.c +1 −1
  28. libswresample/swresample.c +1 −1
  29. libswresample/swresample_internal.h +1 −1
  30. tools/graph2dot.c +1 −1
doc/filters.texi+3−3
@@ -268,7 +268,7 @@ corresponding numeric value defined in @file{libavutil/samplefmt.h}. Use 'p' · 267 unmodified lines
268268 suffix for a planar sample format.
269269
270270 @var{channel_layout} specifies the channel layout, and can be a string
271−or the corresponding number value defined in @file{libavutil/audioconvert.h}.
271+or the corresponding number value defined in @file{libavutil/channel_layout.h}.
272272
273273 The special parameter "auto", signifies that the filter will
274274 automatically select the output format depending on the output filter.
@@ -949,8 +949,8 @@ the enum AVSampleFormat in @file{libavutil/samplefmt.h} · 674 unmodified lines
949949 @item channel_layout
950950 The channel layout of the incoming audio buffers.
951951 Either a channel layout name from channel_layout_map in
952−@file{libavutil/audioconvert.c} or its corresponding integer representation
953−from the AV_CH_LAYOUT_* macros in @file{libavutil/audioconvert.h}
952+@file{libavutil/channel_layout.c} or its corresponding integer representation
953+from the AV_CH_LAYOUT_* macros in @file{libavutil/channel_layout.h}
954954
955955 @end table
956956
libavcodec/dcaenc.c+1−1
@@ -21,9 +21,9 @@ · 20 unmodified lines
2121 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2222 */
2323
24+#include "libavutil/channel_layout.h"
2425 #include "libavutil/common.h"
2526 #include "libavutil/avassert.h"
26−#include "libavutil/audioconvert.h"
2727 #include "avcodec.h"
2828 #include "get_bits.h"
2929 #include "internal.h"
libavcodec/vima.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2020 */
2121
22−#include "libavutil/audioconvert.h"
22+#include "libavutil/channel_layout.h"
2323 #include "avcodec.h"
2424 #include "get_bits.h"
2525 #include "adpcm_data.h"
libavdevice/lavfi.c+1−1
@@ -28,13 +28,13 @@ · 27 unmodified lines
2828 #include "float.h" /* DBL_MIN, DBL_MAX */
2929
3030 #include "libavutil/bprint.h"
31+#include "libavutil/channel_layout.h"
3132 #include "libavutil/file.h"
3233 #include "libavutil/log.h"
3334 #include "libavutil/mem.h"
3435 #include "libavutil/opt.h"
3536 #include "libavutil/parseutils.h"
3637 #include "libavutil/pixdesc.h"
37−#include "libavutil/audioconvert.h"
3838 #include "libavfilter/avfilter.h"
3939 #include "libavfilter/avfiltergraph.h"
4040 #include "libavfilter/buffersink.h"
libavfilter/af_aconvert.c+1−1
@@ -25,8 +25,8 @@ · 24 unmodified lines
2525 * sample format and channel layout conversion audio filter
2626 */
2727
28−#include "libavutil/audioconvert.h"
2928 #include "libavutil/avstring.h"
29+#include "libavutil/channel_layout.h"
3030 #include "libswresample/swresample.h"
3131 #include "avfilter.h"
3232 #include "audio.h"
libavfilter/af_amerge.c+1−1
@@ -23,9 +23,9 @@ · 22 unmodified lines
2323 * Audio merging filter
2424 */
2525
26−#include "libavutil/audioconvert.h"
2726 #include "libavutil/avstring.h"
2827 #include "libavutil/bprint.h"
28+#include "libavutil/channel_layout.h"
2929 #include "libavutil/opt.h"
3030 #include "libswresample/swresample.h" // only for SWR_CH_MAX
3131 #include "avfilter.h"
libavfilter/af_aresample.c+1−1
@@ -24,8 +24,8 @@ · 23 unmodified lines
2424 * resampling audio filter
2525 */
2626
27−#include "libavutil/audioconvert.h"
2827 #include "libavutil/avstring.h"
28+#include "libavutil/channel_layout.h"
2929 #include "libavutil/opt.h"
3030 #include "libavutil/samplefmt.h"
3131 #include "libavutil/avassert.h"
libavfilter/af_asetnsamples.c+1−1
@@ -25,8 +25,8 @@ · 24 unmodified lines
2525 */
2626
2727 #include "libavutil/audio_fifo.h"
28−#include "libavutil/audioconvert.h"
2928 #include "libavutil/avassert.h"
29+#include "libavutil/channel_layout.h"
3030 #include "libavutil/opt.h"
3131 #include "avfilter.h"
3232 #include "audio.h"
libavfilter/af_atempo.c+1−1
@@ -40,9 +40,9 @@ · 39 unmodified lines
4040
4141 #include <float.h>
4242 #include "libavcodec/avfft.h"
43−#include "libavutil/audioconvert.h"
4443 #include "libavutil/avassert.h"
4544 #include "libavutil/avstring.h"
45+#include "libavutil/channel_layout.h"
4646 #include "libavutil/eval.h"
4747 #include "libavutil/opt.h"
4848 #include "libavutil/samplefmt.h"
libavfilter/af_earwax.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
2929 * front of the listener. Adapted from the libsox earwax effect.
3030 */
3131
32−#include "libavutil/audioconvert.h"
32+#include "libavutil/channel_layout.h"
3333 #include "avfilter.h"
3434 #include "audio.h"
3535 #include "formats.h"
libavfilter/af_pan.c+1−1
@@ -28,8 +28,8 @@ · 27 unmodified lines
2828 */
2929
3030 #include <stdio.h>
31−#include "libavutil/audioconvert.h"
3231 #include "libavutil/avstring.h"
32+#include "libavutil/channel_layout.h"
3333 #include "libavutil/opt.h"
3434 #include "libswresample/swresample.h"
3535 #include "audio.h"
libavfilter/af_silencedetect.c+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 * Audio silence detector
2424 */
2525
26−#include "libavutil/audioconvert.h"
26+#include "libavutil/channel_layout.h"
2727 #include "libavutil/opt.h"
2828 #include "libavutil/timestamp.h"
2929 #include "audio.h"
libavfilter/af_volume.c+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
2424 * based on ffmpeg.c code
2525 */
2626
27−#include "libavutil/audioconvert.h"
27+#include "libavutil/channel_layout.h"
2828 #include "libavutil/eval.h"
2929 #include "audio.h"
3030 #include "avfilter.h"
libavfilter/af_volumedetect.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
1818 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1919 */
2020
21−#include "libavutil/audioconvert.h"
21+#include "libavutil/channel_layout.h"
2222 #include "libavutil/avassert.h"
2323 #include "audio.h"
2424 #include "avfilter.h"
libavfilter/asrc_aevalsrc.c+1−1
@@ -23,9 +23,9 @@ · 22 unmodified lines
2323 * eval audio source
2424 */
2525
26−#include "libavutil/audioconvert.h"
2726 #include "libavutil/avassert.h"
2827 #include "libavutil/avstring.h"
28+#include "libavutil/channel_layout.h"
2929 #include "libavutil/eval.h"
3030 #include "libavutil/opt.h"
3131 #include "libavutil/parseutils.h"
libavfilter/asrc_flite.c+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
2424 */
2525
2626 #include <flite/flite.h>
27−#include "libavutil/audioconvert.h"
27+#include "libavutil/channel_layout.h"
2828 #include "libavutil/file.h"
2929 #include "libavutil/opt.h"
3030 #include "avfilter.h"
libavfilter/avf_concat.c+1−1
@@ -23,8 +23,8 @@ · 22 unmodified lines
2323 * concat audio-video filter
2424 */
2525
26−#include "libavutil/audioconvert.h"
2726 #include "libavutil/avassert.h"
27+#include "libavutil/channel_layout.h"
2828 #include "libavutil/opt.h"
2929 #include "avfilter.h"
3030 #define FF_BUFQUEUE_SIZE 256
libavfilter/avf_showspectrum.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 #include <math.h>
2828
2929 #include "libavcodec/avfft.h"
30−#include "libavutil/audioconvert.h"
30+#include "libavutil/channel_layout.h"
3131 #include "libavutil/opt.h"
3232 #include "avfilter.h"
3333 #include "internal.h"
libavfilter/avf_showwaves.c+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 * audio to video multimedia filter
2424 */
2525
26−#include "libavutil/audioconvert.h"
26+#include "libavutil/channel_layout.h"
2727 #include "libavutil/opt.h"
2828 #include "libavutil/parseutils.h"
2929 #include "avfilter.h"
libavfilter/f_ebur128.c+1−1
@@ -30,9 +30,9 @@ · 29 unmodified lines
3030
3131 #include <math.h>
3232
33−#include "libavutil/audioconvert.h"
3433 #include "libavutil/avassert.h"
3534 #include "libavutil/avstring.h"
35+#include "libavutil/channel_layout.h"
3636 #include "libavutil/xga_font_data.h"
3737 #include "libavutil/opt.h"
3838 #include "libavutil/timestamp.h"
libavfilter/formats.c+1−1
@@ -19,11 +19,11 @@ · 18 unmodified lines
1919 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2020 */
2121
22+#include "libavutil/channel_layout.h"
2223 #include "libavutil/common.h"
2324 #include "libavutil/eval.h"
2425 #include "libavutil/pixdesc.h"
2526 #include "libavutil/parseutils.h"
26−#include "libavutil/audioconvert.h"
2727 #include "avfilter.h"
2828 #include "internal.h"
2929 #include "formats.h"
libavfilter/graphdump.c+1−1
@@ -21,7 +21,7 @@ · 20 unmodified lines
2121
2222 #include <string.h>
2323
24−#include "libavutil/audioconvert.h"
24+#include "libavutil/channel_layout.h"
2525 #include "libavutil/bprint.h"
2626 #include "libavutil/pixdesc.h"
2727 #include "avfilter.h"
libavfilter/sink_buffer.c+1−1
@@ -23,8 +23,8 @@ · 22 unmodified lines
2323 * buffer sink
2424 */
2525
26−#include "libavutil/audioconvert.h"
2726 #include "libavutil/avassert.h"
27+#include "libavutil/channel_layout.h"
2828 #include "libavutil/fifo.h"
2929 #include "avfilter.h"
3030 #include "buffersink.h"
libavfilter/src_buffer.c+1−1
@@ -31,8 +31,8 @@ · 30 unmodified lines
3131 #include "avcodec.h"
3232 #include "buffersrc.h"
3333 #include "asrc_abuffer.h"
34−#include "libavutil/audioconvert.h"
3534 #include "libavutil/avstring.h"
35+#include "libavutil/channel_layout.h"
3636 #include "libavutil/fifo.h"
3737 #include "libavutil/imgutils.h"
3838
libswresample/audioconvert.h+0−1
@@ -31,7 +31,6 @@ · 30 unmodified lines
3131
3232 #include "swresample_internal.h"
3333 #include "libavutil/cpu.h"
34−#include "libavutil/audioconvert.h"
3534
3635
3736 typedef void (conv_func_type)(uint8_t *po, const uint8_t *pi, int is, int os, uint8_t *end);
libswresample/rematrix.c+1−1
@@ -19,8 +19,8 @@ · 18 unmodified lines
1919 */
2020
2121 #include "swresample_internal.h"
22−#include "libavutil/audioconvert.h"
2322 #include "libavutil/avassert.h"
23+#include "libavutil/channel_layout.h"
2424
2525 #define ONE (1.0)
2626 #define R(x) x
libswresample/swresample-test.c+1−1
@@ -20,8 +20,8 @@ · 19 unmodified lines
2020 */
2121
2222 #include "libavutil/avassert.h"
23+#include "libavutil/channel_layout.h"
2324 #include "libavutil/common.h"
24−#include "libavutil/audioconvert.h"
2525 #include "libavutil/opt.h"
2626 #include "swresample.h"
2727
libswresample/swresample.c+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
2222 #include "swresample_internal.h"
2323 #include "audioconvert.h"
2424 #include "libavutil/avassert.h"
25−#include "libavutil/audioconvert.h"
25+#include "libavutil/channel_layout.h"
2626
2727 #include <float.h>
2828
libswresample/swresample_internal.h+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
2222 #define SWR_INTERNAL_H
2323
2424 #include "swresample.h"
25−#include "libavutil/audioconvert.h"
25+#include "libavutil/channel_layout.h"
2626 #include "config.h"
2727
2828 #define SQRT3_2 1.22474487139158904909 /* sqrt(3/2) */
tools/graph2dot.c+1−1
@@ -25,9 +25,9 @@ · 24 unmodified lines
2525 #include <stdio.h>
2626 #include <string.h>
2727
28+#include "libavutil/channel_layout.h"
2829 #include "libavutil/mem.h"
2930 #include "libavutil/pixdesc.h"
30−#include "libavutil/audioconvert.h"
3131 #include "libavfilter/avfiltergraph.h"
3232
3333 #if !HAVE_GETOPT

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