Also include channel_layout.h directly wherever used.
Unified · Split
| @@ -34,6 +34,7 @@ · 33 unmodified lines | |||
| 34 | #include <libavformat/avformat.h> | 34 | #include <libavformat/avformat.h> |
| 35 | #include <libavfilter/buffersink.h> | 35 | #include <libavfilter/buffersink.h> |
| 36 | #include <libavfilter/buffersrc.h> | 36 | #include <libavfilter/buffersrc.h> |
| 37 | #include <libavutil/channel_layout.h> | ||
| 37 | #include <libavutil/opt.h> | 38 | #include <libavutil/opt.h> |
| 38 | 39 | ||
| 39 | static const char *filter_descr = "aresample=8000,aformat=sample_fmts=s16:channel_layouts=mono"; | 40 | static const char *filter_descr = "aresample=8000,aformat=sample_fmts=s16:channel_layouts=mono"; |
| @@ -38,6 +38,7 @@ · 37 unmodified lines | |||
| 38 | #include "libavutil/audio_fifo.h" | 38 | #include "libavutil/audio_fifo.h" |
| 39 | #include "libavutil/avassert.h" | 39 | #include "libavutil/avassert.h" |
| 40 | #include "libavutil/avstring.h" | 40 | #include "libavutil/avstring.h" |
| 41 | #include "libavutil/channel_layout.h" | ||
| 41 | #include "libavutil/frame.h" | 42 | #include "libavutil/frame.h" |
| 42 | #include "libavutil/opt.h" | 43 | #include "libavutil/opt.h" |
| 43 | 44 | ||
| @@ -32,6 +32,7 @@ · 31 unmodified lines | |||
| 32 | #include <libavformat/avformat.h> | 32 | #include <libavformat/avformat.h> |
| 33 | #include <libavfilter/buffersink.h> | 33 | #include <libavfilter/buffersink.h> |
| 34 | #include <libavfilter/buffersrc.h> | 34 | #include <libavfilter/buffersrc.h> |
| 35 | #include <libavutil/channel_layout.h> | ||
| 35 | #include <libavutil/opt.h> | 36 | #include <libavutil/opt.h> |
| 36 | #include <libavutil/pixdesc.h> | 37 | #include <libavutil/pixdesc.h> |
| 37 | 38 | ||
| @@ -41,6 +41,7 @@ · 40 unmodified lines | |||
| 41 | #include "libavutil/avassert.h" | 41 | #include "libavutil/avassert.h" |
| 42 | #include "libavutil/avstring.h" | 42 | #include "libavutil/avstring.h" |
| 43 | #include "libavutil/bprint.h" | 43 | #include "libavutil/bprint.h" |
| 44 | #include "libavutil/channel_layout.h" | ||
| 44 | #include "libavutil/display.h" | 45 | #include "libavutil/display.h" |
| 45 | #include "libavutil/mathematics.h" | 46 | #include "libavutil/mathematics.h" |
| 46 | #include "libavutil/imgutils.h" | 47 | #include "libavutil/imgutils.h" |
| @@ -31,6 +31,7 @@ · 30 unmodified lines | |||
| 31 | #include <stdint.h> | 31 | #include <stdint.h> |
| 32 | 32 | ||
| 33 | #include "libavutil/avstring.h" | 33 | #include "libavutil/avstring.h" |
| 34 | #include "libavutil/channel_layout.h" | ||
| 34 | #include "libavutil/eval.h" | 35 | #include "libavutil/eval.h" |
| 35 | #include "libavutil/mathematics.h" | 36 | #include "libavutil/mathematics.h" |
| 36 | #include "libavutil/pixdesc.h" | 37 | #include "libavutil/pixdesc.h" |
| @@ -33,6 +33,7 @@ · 32 unmodified lines | |||
| 33 | #include "libavutil/avassert.h" | 33 | #include "libavutil/avassert.h" |
| 34 | #include "libavutil/avstring.h" | 34 | #include "libavutil/avstring.h" |
| 35 | #include "libavutil/bprint.h" | 35 | #include "libavutil/bprint.h" |
| 36 | #include "libavutil/channel_layout.h" | ||
| 36 | #include "libavutil/display.h" | 37 | #include "libavutil/display.h" |
| 37 | #include "libavutil/hash.h" | 38 | #include "libavutil/hash.h" |
| 38 | #include "libavutil/hdr_dynamic_metadata.h" | 39 | #include "libavutil/hdr_dynamic_metadata.h" |
| @@ -89,6 +89,7 @@ · 88 unmodified lines | |||
| 89 | Parametric Stereo. | 89 | Parametric Stereo. |
| 90 | */ | 90 | */ |
| 91 | 91 | ||
| 92 | #include "libavutil/channel_layout.h" | ||
| 92 | #include "libavutil/thread.h" | 93 | #include "libavutil/thread.h" |
| 93 | 94 | ||
| 94 | static VLC vlc_scalefactors; | 95 | static VLC vlc_scalefactors; |
| @@ -30,6 +30,7 @@ · 29 unmodified lines | |||
| 30 | ***********************************/ | 30 | ***********************************/ |
| 31 | #include <float.h> | 31 | #include <float.h> |
| 32 | 32 | ||
| 33 | #include "libavutil/channel_layout.h" | ||
| 33 | #include "libavutil/libm.h" | 34 | #include "libavutil/libm.h" |
| 34 | #include "libavutil/float_dsp.h" | 35 | #include "libavutil/float_dsp.h" |
| 35 | #include "libavutil/opt.h" | 36 | #include "libavutil/opt.h" |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | #ifndef AVCODEC_AACENC_H | 22 | #ifndef AVCODEC_AACENC_H |
| 23 | #define AVCODEC_AACENC_H | 23 | #define AVCODEC_AACENC_H |
| 24 | 24 | ||
| 25 | #include "libavutil/channel_layout.h" | ||
| 25 | #include "libavutil/float_dsp.h" | 26 | #include "libavutil/float_dsp.h" |
| 26 | #include "libavutil/mem_internal.h" | 27 | #include "libavutil/mem_internal.h" |
| 27 | 28 | ||
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | #ifndef AVCODEC_AACENCTAB_H | 28 | #ifndef AVCODEC_AACENCTAB_H |
| 29 | #define AVCODEC_AACENCTAB_H | 29 | #define AVCODEC_AACENCTAB_H |
| 30 | 30 | ||
| 31 | #include "libavutil/channel_layout.h" | ||
| 31 | #include "aac.h" | 32 | #include "aac.h" |
| 32 | 33 | ||
| 33 | /** Total number of usable codebooks **/ | 34 | /** Total number of usable codebooks **/ |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include "libavutil/channel_layout.h" | ||
| 23 | #include "aptx.h" | 24 | #include "aptx.h" |
| 24 | 25 | ||
| 25 | /* | 26 | /* |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include "libavutil/channel_layout.h" | ||
| 23 | #include "aptx.h" | 24 | #include "aptx.h" |
| 24 | #include "encode.h" | 25 | #include "encode.h" |
| 25 | 26 | ||
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/channel_layout.h" | ||
| 22 | #include "libavutil/thread.h" | 23 | #include "libavutil/thread.h" |
| 23 | 24 | ||
| 24 | #include "internal.h" | 25 | #include "internal.h" |
| @@ -29,6 +29,7 @@ · 28 unmodified lines | |||
| 29 | #include "internal.h" | 29 | #include "internal.h" |
| 30 | #include "mpegaudiodecheader.h" | 30 | #include "mpegaudiodecheader.h" |
| 31 | #include "libavutil/avassert.h" | 31 | #include "libavutil/avassert.h" |
| 32 | #include "libavutil/channel_layout.h" | ||
| 32 | #include "libavutil/opt.h" | 33 | #include "libavutil/opt.h" |
| 33 | #include "libavutil/log.h" | 34 | #include "libavutil/log.h" |
| 34 | 35 | ||
| @@ -33,6 +33,7 @@ · 32 unmodified lines | |||
| 33 | #include "internal.h" | 33 | #include "internal.h" |
| 34 | #include "libavformat/isom.h" | 34 | #include "libavformat/isom.h" |
| 35 | #include "libavutil/avassert.h" | 35 | #include "libavutil/avassert.h" |
| 36 | #include "libavutil/channel_layout.h" | ||
| 36 | #include "libavutil/opt.h" | 37 | #include "libavutil/opt.h" |
| 37 | #include "libavutil/log.h" | 38 | #include "libavutil/log.h" |
| 38 | 39 | ||
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | #include "libavutil/avassert.h" | 27 | #include "libavutil/avassert.h" |
| 28 | #include "libavutil/avstring.h" | 28 | #include "libavutil/avstring.h" |
| 29 | #include "libavutil/bprint.h" | 29 | #include "libavutil/bprint.h" |
| 30 | #include "libavutil/channel_layout.h" | ||
| 30 | #include "libavutil/imgutils.h" | 31 | #include "libavutil/imgutils.h" |
| 31 | #include "libavutil/mem.h" | 32 | #include "libavutil/mem.h" |
| 32 | #include "libavutil/opt.h" | 33 | #include "libavutil/opt.h" |
| @@ -33,7 +33,6 @@ · 32 unmodified lines | |||
| 33 | #include "libavutil/avutil.h" | 33 | #include "libavutil/avutil.h" |
| 34 | #include "libavutil/buffer.h" | 34 | #include "libavutil/buffer.h" |
| 35 | #include "libavutil/cpu.h" | 35 | #include "libavutil/cpu.h" |
| 36 | #include "libavutil/channel_layout.h" | ||
| 37 | #include "libavutil/dict.h" | 36 | #include "libavutil/dict.h" |
| 38 | #include "libavutil/frame.h" | 37 | #include "libavutil/frame.h" |
| 39 | #include "libavutil/hwcontext.h" | 38 | #include "libavutil/hwcontext.h" |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/channel_layout.h" | ||
| 21 | #include "dcaadpcm.h" | 22 | #include "dcaadpcm.h" |
| 22 | #include "dcadec.h" | 23 | #include "dcadec.h" |
| 23 | #include "dcadata.h" | 24 | #include "dcadata.h" |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/channel_layout.h" | ||
| 21 | #include "dcadec.h" | 22 | #include "dcadec.h" |
| 22 | #include "dcadata.h" | 23 | #include "dcadata.h" |
| 23 | #include "dcamath.h" | 24 | #include "dcamath.h" |
| @@ -30,6 +30,7 @@ · 29 unmodified lines | |||
| 30 | #include "libavutil/avassert.h" | 30 | #include "libavutil/avassert.h" |
| 31 | #include "libavutil/avstring.h" | 31 | #include "libavutil/avstring.h" |
| 32 | #include "libavutil/bprint.h" | 32 | #include "libavutil/bprint.h" |
| 33 | #include "libavutil/channel_layout.h" | ||
| 33 | #include "libavutil/common.h" | 34 | #include "libavutil/common.h" |
| 34 | #include "libavutil/frame.h" | 35 | #include "libavutil/frame.h" |
| 35 | #include "libavutil/hwcontext.h" | 36 | #include "libavutil/hwcontext.h" |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/channel_layout.h" | ||
| 21 | #include "libavutil/float_dsp.h" | 22 | #include "libavutil/float_dsp.h" |
| 22 | #include "libavutil/thread.h" | 23 | #include "libavutil/thread.h" |
| 23 | #include "libavutil/mem.h" | 24 | #include "libavutil/mem.h" |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/channel_layout.h" | ||
| 21 | #include "avcodec.h" | 22 | #include "avcodec.h" |
| 22 | #include "dolby_e.h" | 23 | #include "dolby_e.h" |
| 23 | #include "get_bits.h" | 24 | #include "get_bits.h" |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/channel_layout.h" | ||
| 21 | #include "libavutil/intreadwrite.h" | 22 | #include "libavutil/intreadwrite.h" |
| 22 | #include "avcodec.h" | 23 | #include "avcodec.h" |
| 23 | #include "internal.h" | 24 | #include "internal.h" |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | 20 | ||
| 21 | #include "libavutil/attributes.h" | 21 | #include "libavutil/attributes.h" |
| 22 | #include "libavutil/avassert.h" | 22 | #include "libavutil/avassert.h" |
| 23 | #include "libavutil/channel_layout.h" | ||
| 23 | #include "libavutil/frame.h" | 24 | #include "libavutil/frame.h" |
| 24 | #include "libavutil/imgutils.h" | 25 | #include "libavutil/imgutils.h" |
| 25 | #include "libavutil/internal.h" | 26 | #include "libavutil/internal.h" |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | * @author Paul B Mahol | 25 | * @author Paul B Mahol |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include "libavutil/channel_layout.h" | ||
| 28 | #include "libavutil/mathematics.h" | 29 | #include "libavutil/mathematics.h" |
| 29 | #include "libavutil/opt.h" | 30 | #include "libavutil/opt.h" |
| 30 | #include "avcodec.h" | 31 | #include "avcodec.h" |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/avassert.h" | 22 | #include "libavutil/avassert.h" |
| 23 | #include "libavutil/channel_layout.h" | ||
| 23 | #include "libavutil/crc.h" | 24 | #include "libavutil/crc.h" |
| 24 | #include "libavutil/intmath.h" | 25 | #include "libavutil/intmath.h" |
| 25 | #include "libavutil/md5.h" | 26 | #include "libavutil/md5.h" |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include "libavutil/avassert.h" | 30 | #include "libavutil/avassert.h" |
| 31 | #include "libavutil/channel_layout.h" | ||
| 31 | #include "avcodec.h" | 32 | #include "avcodec.h" |
| 32 | #include "encode.h" | 33 | #include "encode.h" |
| 33 | #include "internal.h" | 34 | #include "internal.h" |
| @@ -30,6 +30,7 @@ · 29 unmodified lines | |||
| 30 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 30 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include "libavutil/channel_layout.h" | ||
| 33 | #include "avcodec.h" | 34 | #include "avcodec.h" |
| 34 | #include "internal.h" | 35 | #include "internal.h" |
| 35 | #include "get_bits.h" | 36 | #include "get_bits.h" |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <codec2/codec2.h> | 22 | #include <codec2/codec2.h> |
| 23 | #include "libavutil/channel_layout.h" | ||
| 23 | #include "avcodec.h" | 24 | #include "avcodec.h" |
| 24 | #include "libavutil/opt.h" | 25 | #include "libavutil/opt.h" |
| 25 | #include "encode.h" | 26 | #include "encode.h" |
| @@ -34,6 +34,7 @@ · 33 unmodified lines | |||
| 34 | #include <gsm/gsm.h> | 34 | #include <gsm/gsm.h> |
| 35 | #endif | 35 | #endif |
| 36 | 36 | ||
| 37 | #include "libavutil/channel_layout.h" | ||
| 37 | #include "libavutil/common.h" | 38 | #include "libavutil/common.h" |
| 38 | 39 | ||
| 39 | #include "avcodec.h" | 40 | #include "avcodec.h" |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | #include <opus.h> | 22 | #include <opus.h> |
| 23 | #include <opus_multistream.h> | 23 | #include <opus_multistream.h> |
| 24 | 24 | ||
| 25 | #include "libavutil/channel_layout.h" | ||
| 25 | #include "libavutil/opt.h" | 26 | #include "libavutil/opt.h" |
| 26 | #include "avcodec.h" | 27 | #include "avcodec.h" |
| 27 | #include "bytestream.h" | 28 | #include "bytestream.h" |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | 21 | ||
| 22 | #include <shine/layer3.h> | 22 | #include <shine/layer3.h> |
| 23 | 23 | ||
| 24 | #include "libavutil/channel_layout.h" | ||
| 24 | #include "libavutil/intreadwrite.h" | 25 | #include "libavutil/intreadwrite.h" |
| 25 | #include "audio_frame_queue.h" | 26 | #include "audio_frame_queue.h" |
| 26 | #include "avcodec.h" | 27 | #include "avcodec.h" |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | 26 | ||
| 27 | #include <twolame.h> | 27 | #include <twolame.h> |
| 28 | 28 | ||
| 29 | #include "libavutil/channel_layout.h" | ||
| 29 | #include "libavutil/common.h" | 30 | #include "libavutil/common.h" |
| 30 | #include "libavutil/opt.h" | 31 | #include "libavutil/opt.h" |
| 31 | 32 | ||
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | #include <vorbis/vorbisenc.h> | 21 | #include <vorbis/vorbisenc.h> |
| 22 | 22 | ||
| 23 | #include "libavutil/avassert.h" | 23 | #include "libavutil/avassert.h" |
| 24 | #include "libavutil/channel_layout.h" | ||
| 24 | #include "libavutil/fifo.h" | 25 | #include "libavutil/fifo.h" |
| 25 | #include "libavutil/opt.h" | 26 | #include "libavutil/opt.h" |
| 26 | #include "avcodec.h" | 27 | #include "avcodec.h" |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | 21 | ||
| 22 | #include <stdint.h> | 22 | #include <stdint.h> |
| 23 | 23 | ||
| 24 | #include "libavutil/channel_layout.h" | ||
| 24 | #include "libavutil/crc.h" | 25 | #include "libavutil/crc.h" |
| 25 | #include "libavutil/intreadwrite.h" | 26 | #include "libavutil/intreadwrite.h" |
| 26 | #include "libavutil/thread.h" | 27 | #include "libavutil/thread.h" |
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | #include "internal.h" | 25 | #include "internal.h" |
| 26 | #include "put_bits.h" | 26 | #include "put_bits.h" |
| 27 | #include "audio_frame_queue.h" | 27 | #include "audio_frame_queue.h" |
| 28 | #include "libavutil/channel_layout.h" | ||
| 28 | #include "libavutil/crc.h" | 29 | #include "libavutil/crc.h" |
| 29 | #include "libavutil/avstring.h" | 30 | #include "libavutil/avstring.h" |
| 30 | #include "libavutil/samplefmt.h" | 31 | #include "libavutil/samplefmt.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/channel_layout.h" | ||
| 22 | #include "mpegaudioenc_template.c" | 23 | #include "mpegaudioenc_template.c" |
| 23 | 24 | ||
| 24 | const AVCodec ff_mp2fixed_encoder = { | 25 | const AVCodec ff_mp2fixed_encoder = { |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/channel_layout.h" | ||
| 22 | #define USE_FLOATS 1 | 23 | #define USE_FLOATS 1 |
| 23 | #include "mpegaudioenc_template.c" | 24 | #include "mpegaudioenc_template.c" |
| 24 | 25 | ||
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | 26 | ||
| 27 | #include <stdint.h> | 27 | #include <stdint.h> |
| 28 | 28 | ||
| 29 | #include "libavutil/channel_layout.h" | ||
| 29 | #include "libavutil/error.h" | 30 | #include "libavutil/error.h" |
| 30 | #include "libavutil/ffmath.h" | 31 | #include "libavutil/ffmath.h" |
| 31 | 32 | ||
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | #include "opusenc_psy.h" | 25 | #include "opusenc_psy.h" |
| 26 | #include "opustab.h" | 26 | #include "opustab.h" |
| 27 | 27 | ||
| 28 | #include "libavutil/channel_layout.h" | ||
| 28 | #include "libavutil/float_dsp.h" | 29 | #include "libavutil/float_dsp.h" |
| 29 | #include "libavutil/mem_internal.h" | 30 | #include "libavutil/mem_internal.h" |
| 30 | #include "libavutil/opt.h" | 31 | #include "libavutil/opt.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/channel_layout.h" | ||
| 22 | #include "libavutil/intreadwrite.h" | 23 | #include "libavutil/intreadwrite.h" |
| 23 | 24 | ||
| 24 | #include "avcodec.h" | 25 | #include "avcodec.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/channel_layout.h" | ||
| 22 | #include "avcodec.h" | 23 | #include "avcodec.h" |
| 23 | #include "bytestream.h" | 24 | #include "bytestream.h" |
| 24 | #include "encode.h" | 25 | #include "encode.h" |
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | 27 | ||
| 28 | #include <float.h> | 28 | #include <float.h> |
| 29 | 29 | ||
| 30 | #include "libavutil/channel_layout.h" | ||
| 30 | #include "avcodec.h" | 31 | #include "avcodec.h" |
| 31 | #include "audio_frame_queue.h" | 32 | #include "audio_frame_queue.h" |
| 32 | #include "celp_filters.h" | 33 | #include "celp_filters.h" |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include "libavutil/channel_layout.h" | ||
| 23 | #include "libavutil/intreadwrite.h" | 24 | #include "libavutil/intreadwrite.h" |
| 24 | #include "libavutil/opt.h" | 25 | #include "libavutil/opt.h" |
| 25 | #include "libavutil/log.h" | 26 | #include "libavutil/log.h" |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include "libavutil/channel_layout.h" | ||
| 23 | #include "avcodec.h" | 24 | #include "avcodec.h" |
| 24 | #include "encode.h" | 25 | #include "encode.h" |
| 25 | #include "internal.h" | 26 | #include "internal.h" |
| @@ -32,6 +32,7 @@ · 31 unmodified lines | |||
| 32 | 32 | ||
| 33 | #include "avcodec.h" | 33 | #include "avcodec.h" |
| 34 | #include "internal.h" | 34 | #include "internal.h" |
| 35 | #include "libavutil/channel_layout.h" | ||
| 35 | #include "libavutil/intreadwrite.h" | 36 | #include "libavutil/intreadwrite.h" |
| 36 | #include "libavutil/mem_internal.h" | 37 | #include "libavutil/mem_internal.h" |
| 37 | #include "sbc.h" | 38 | #include "sbc.h" |
| @@ -30,6 +30,7 @@ · 29 unmodified lines | |||
| 30 | * SBC encoder implementation | 30 | * SBC encoder implementation |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include "libavutil/channel_layout.h" | ||
| 33 | #include "libavutil/opt.h" | 34 | #include "libavutil/opt.h" |
| 34 | #include "avcodec.h" | 35 | #include "avcodec.h" |
| 35 | #include "encode.h" | 36 | #include "encode.h" |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 21 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include "libavutil/channel_layout.h" | ||
| 24 | #include "libavutil/tx.h" | 25 | #include "libavutil/tx.h" |
| 25 | #include "libavutil/float_dsp.h" | 26 | #include "libavutil/float_dsp.h" |
| 26 | #include "libavutil/mem_internal.h" | 27 | #include "libavutil/mem_internal.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/channel_layout.h" | ||
| 22 | #include "libavutil/crc.h" | 23 | #include "libavutil/crc.h" |
| 23 | #include "libavutil/intreadwrite.h" | 24 | #include "libavutil/intreadwrite.h" |
| 24 | 25 | ||
| @@ -29,6 +29,7 @@ · 28 unmodified lines | |||
| 29 | 29 | ||
| 30 | #include <limits.h> | 30 | #include <limits.h> |
| 31 | 31 | ||
| 32 | #include "libavutil/channel_layout.h" | ||
| 32 | #include "libavutil/crc.h" | 33 | #include "libavutil/crc.h" |
| 33 | #include "libavutil/intreadwrite.h" | 34 | #include "libavutil/intreadwrite.h" |
| 34 | #include "libavutil/opt.h" | 35 | #include "libavutil/opt.h" |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | #include "config.h" | 28 | #include "config.h" |
| 29 | #include "libavutil/avassert.h" | 29 | #include "libavutil/avassert.h" |
| 30 | #include "libavutil/avstring.h" | 30 | #include "libavutil/avstring.h" |
| 31 | #include "libavutil/channel_layout.h" | ||
| 31 | #include "libavutil/intreadwrite.h" | 32 | #include "libavutil/intreadwrite.h" |
| 32 | #include "libavutil/mem.h" | 33 | #include "libavutil/mem.h" |
| 33 | #include "libavutil/pixdesc.h" | 34 | #include "libavutil/pixdesc.h" |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | 20 | ||
| 21 | #define BITSTREAM_WRITER_LE | 21 | #define BITSTREAM_WRITER_LE |
| 22 | 22 | ||
| 23 | #include "libavutil/channel_layout.h" | ||
| 23 | #include "libavutil/intreadwrite.h" | 24 | #include "libavutil/intreadwrite.h" |
| 24 | #include "libavutil/opt.h" | 25 | #include "libavutil/opt.h" |
| 25 | #include "avcodec.h" | 26 | #include "avcodec.h" |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | #import <AVFoundation/AVFoundation.h> | 28 | #import <AVFoundation/AVFoundation.h> |
| 29 | #include <pthread.h> | 29 | #include <pthread.h> |
| 30 | 30 | ||
| 31 | #include "libavutil/channel_layout.h" | ||
| 31 | #include "libavutil/pixdesc.h" | 32 | #include "libavutil/pixdesc.h" |
| 32 | #include "libavutil/opt.h" | 33 | #include "libavutil/opt.h" |
| 33 | #include "libavutil/avstring.h" | 34 | #include "libavutil/avstring.h" |
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include <pulse/error.h> | 23 | #include <pulse/error.h> |
| 24 | #include "libavformat/avformat.h" | 24 | #include "libavformat/avformat.h" |
| 25 | #include "libavformat/internal.h" | 25 | #include "libavformat/internal.h" |
| 26 | #include "libavutil/channel_layout.h" | ||
| 26 | #include "libavutil/internal.h" | 27 | #include "libavutil/internal.h" |
| 27 | #include "libavutil/opt.h" | 28 | #include "libavutil/opt.h" |
| 28 | #include "libavutil/time.h" | 29 | #include "libavutil/time.h" |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | #include <float.h> | 26 | #include <float.h> |
| 27 | 27 | ||
| 28 | #include "libavutil/avstring.h" | 28 | #include "libavutil/avstring.h" |
| 29 | #include "libavutil/channel_layout.h" | ||
| 29 | #include "libavutil/common.h" | 30 | #include "libavutil/common.h" |
| 30 | #include "libavutil/float_dsp.h" | 31 | #include "libavutil/float_dsp.h" |
| 31 | #include "libavutil/intreadwrite.h" | 32 | #include "libavutil/intreadwrite.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/avassert.h" | 21 | #include "libavutil/avassert.h" |
| 22 | #include "libavutil/channel_layout.h" | ||
| 22 | #include "libavutil/opt.h" | 23 | #include "libavutil/opt.h" |
| 23 | #include "avfilter.h" | 24 | #include "avfilter.h" |
| 24 | #include "internal.h" | 25 | #include "internal.h" |
| @@ -63,6 +63,7 @@ · 62 unmodified lines | |||
| 63 | */ | 63 | */ |
| 64 | 64 | ||
| 65 | #include "libavutil/avassert.h" | 65 | #include "libavutil/avassert.h" |
| 66 | #include "libavutil/channel_layout.h" | ||
| 66 | #include "libavutil/ffmath.h" | 67 | #include "libavutil/ffmath.h" |
| 67 | #include "libavutil/opt.h" | 68 | #include "libavutil/opt.h" |
| 68 | #include "audio.h" | 69 | #include "audio.h" |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/channel_layout.h" | ||
| 21 | #include "libavutil/opt.h" | 22 | #include "libavutil/opt.h" |
| 22 | #include "libavutil/eval.h" | 23 | #include "libavutil/eval.h" |
| 23 | #include "libavutil/avassert.h" | 24 | #include "libavutil/avassert.h" |
| @@ -43,6 +43,7 @@ · 42 unmodified lines | |||
| 43 | * HDCD decoding filter | 43 | * HDCD decoding filter |
| 44 | */ | 44 | */ |
| 45 | 45 | ||
| 46 | #include "libavutil/channel_layout.h" | ||
| 46 | #include "libavutil/opt.h" | 47 | #include "libavutil/opt.h" |
| 47 | #include "libavutil/avassert.h" | 48 | #include "libavutil/avassert.h" |
| 48 | #include "avfilter.h" | 49 | #include "avfilter.h" |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | #include <float.h> | 28 | #include <float.h> |
| 29 | 29 | ||
| 30 | #include "libavutil/avassert.h" | 30 | #include "libavutil/avassert.h" |
| 31 | #include "libavutil/channel_layout.h" | ||
| 31 | #include "libavutil/opt.h" | 32 | #include "libavutil/opt.h" |
| 32 | 33 | ||
| 33 | #define FF_BUFQUEUE_SIZE (1024) | 34 | #define FF_BUFQUEUE_SIZE (1024) |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/channel_layout.h" | ||
| 21 | #include "libavutil/eval.h" | 22 | #include "libavutil/eval.h" |
| 22 | #include "libavutil/opt.h" | 23 | #include "libavutil/opt.h" |
| 23 | #include "libavutil/tx.h" | 24 | #include "libavutil/tx.h" |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/channel_layout.h" | ||
| 21 | #include "libavutil/opt.h" | 22 | #include "libavutil/opt.h" |
| 22 | #include "audio.h" | 23 | #include "audio.h" |
| 23 | #include "avfilter.h" | 24 | #include "avfilter.h" |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/channel_layout.h" | ||
| 21 | #include "libavutil/opt.h" | 22 | #include "libavutil/opt.h" |
| 22 | #include "audio.h" | 23 | #include "audio.h" |
| 23 | #include "avfilter.h" | 24 | #include "avfilter.h" |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/avassert.h" | 22 | #include "libavutil/avassert.h" |
| 23 | #include "libavutil/channel_layout.h" | ||
| 23 | #include "libavutil/opt.h" | 24 | #include "libavutil/opt.h" |
| 24 | 25 | ||
| 25 | #include "libavcodec/avfft.h" | 26 | #include "libavcodec/avfft.h" |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | #include "config.h" | 21 | #include "config.h" |
| 22 | #include "libavcodec/avfft.h" | 22 | #include "libavcodec/avfft.h" |
| 23 | #include "libavutil/avassert.h" | 23 | #include "libavutil/avassert.h" |
| 24 | #include "libavutil/channel_layout.h" | ||
| 24 | #include "libavutil/opt.h" | 25 | #include "libavutil/opt.h" |
| 25 | #include "libavutil/xga_font_data.h" | 26 | #include "libavutil/xga_font_data.h" |
| 26 | #include "libavutil/eval.h" | 27 | #include "libavutil/eval.h" |
| @@ -33,6 +33,7 @@ · 32 unmodified lines | |||
| 33 | #include "libavutil/attributes.h" | 33 | #include "libavutil/attributes.h" |
| 34 | #include "libavutil/avstring.h" | 34 | #include "libavutil/avstring.h" |
| 35 | #include "libavutil/avassert.h" | 35 | #include "libavutil/avassert.h" |
| 36 | #include "libavutil/channel_layout.h" | ||
| 36 | #include "libavutil/opt.h" | 37 | #include "libavutil/opt.h" |
| 37 | #include "libavutil/imgutils.h" | 38 | #include "libavutil/imgutils.h" |
| 38 | #include "libavutil/internal.h" | 39 | #include "libavutil/internal.h" |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/channel_layout.h" | ||
| 21 | #include "libavfilter/formats.c" | 22 | #include "libavfilter/formats.c" |
| 22 | 23 | ||
| 23 | #undef printf | 24 | #undef printf |
| @@ -19,6 +19,8 @@ · 18 unmodified lines | |||
| 19 | * License along with FFmpeg; if not, write to the Free Software | 19 | * License along with FFmpeg; if not, write to the Free Software |
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | |||
| 23 | #include "libavutil/channel_layout.h" | ||
| 22 | #include "avformat.h" | 24 | #include "avformat.h" |
| 23 | #include "internal.h" | 25 | #include "internal.h" |
| 24 | #include "rawenc.h" | 26 | #include "rawenc.h" |
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include "internal.h" | 23 | #include "internal.h" |
| 24 | #include "rawenc.h" | 24 | #include "rawenc.h" |
| 25 | #include "libavutil/avassert.h" | 25 | #include "libavutil/avassert.h" |
| 26 | #include "libavutil/channel_layout.h" | ||
| 26 | #include "libavutil/internal.h" | 27 | #include "libavutil/internal.h" |
| 27 | #include "libavutil/intreadwrite.h" | 28 | #include "libavutil/intreadwrite.h" |
| 28 | 29 | ||
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | */ | 21 | */ |
| 22 | #include "avformat.h" | 22 | #include "avformat.h" |
| 23 | #include "internal.h" | 23 | #include "internal.h" |
| 24 | #include "libavutil/channel_layout.h" | ||
| 24 | #include "libavutil/intreadwrite.h" | 25 | #include "libavutil/intreadwrite.h" |
| 25 | #include "libavutil/avassert.h" | 26 | #include "libavutil/avassert.h" |
| 26 | #include "libavutil/opt.h" | 27 | #include "libavutil/opt.h" |
| @@ -19,6 +19,8 @@ · 18 unmodified lines | |||
| 19 | * License along with FFmpeg; if not, write to the Free Software | 19 | * License along with FFmpeg; if not, write to the Free Software |
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | |||
| 23 | #include "libavutil/channel_layout.h" | ||
| 22 | #include "avformat.h" | 24 | #include "avformat.h" |
| 23 | #include "internal.h" | 25 | #include "internal.h" |
| 24 | #include "libavutil/opt.h" | 26 | #include "libavutil/opt.h" |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | 21 | ||
| 22 | #include <memory.h> | 22 | #include <memory.h> |
| 23 | #include "libavcodec/codec2utils.h" | 23 | #include "libavcodec/codec2utils.h" |
| 24 | #include "libavutil/channel_layout.h" | ||
| 24 | #include "libavutil/intreadwrite.h" | 25 | #include "libavutil/intreadwrite.h" |
| 25 | #include "libavutil/opt.h" | 26 | #include "libavutil/opt.h" |
| 26 | #include "avio_internal.h" | 27 | #include "avio_internal.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/channel_layout.h" | ||
| 22 | #include "libavutil/intreadwrite.h" | 23 | #include "libavutil/intreadwrite.h" |
| 23 | #include "avformat.h" | 24 | #include "avformat.h" |
| 24 | #include "internal.h" | 25 | #include "internal.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/channel_layout.h" | ||
| 22 | #include "libavutil/intreadwrite.h" | 23 | #include "libavutil/intreadwrite.h" |
| 23 | #include "avformat.h" | 24 | #include "avformat.h" |
| 24 | #include "internal.h" | 25 | #include "internal.h" |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | * http://wiki.multimedia.cx/index.php?title=EA_Command_And_Conquer_3_Audio_Codec | 28 | * http://wiki.multimedia.cx/index.php?title=EA_Command_And_Conquer_3_Audio_Codec |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include "libavutil/channel_layout.h" | ||
| 31 | #include "avformat.h" | 32 | #include "avformat.h" |
| 32 | #include "internal.h" | 33 | #include "internal.h" |
| 33 | 34 | ||
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/channel_layout.h" | ||
| 21 | #include "internal.h" | 22 | #include "internal.h" |
| 22 | 23 | ||
| 23 | int ff_framehash_write_header(AVFormatContext *s) | 24 | int ff_framehash_write_header(AVFormatContext *s) |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/channel_layout.h" | ||
| 22 | #include "libavutil/intreadwrite.h" | 23 | #include "libavutil/intreadwrite.h" |
| 23 | #include "avformat.h" | 24 | #include "avformat.h" |
| 24 | #include "internal.h" | 25 | #include "internal.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/channel_layout.h" | ||
| 22 | #include "libavutil/intreadwrite.h" | 23 | #include "libavutil/intreadwrite.h" |
| 23 | #include "libavcodec/internal.h" | 24 | #include "libavcodec/internal.h" |
| 24 | #include "avformat.h" | 25 | #include "avformat.h" |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include "libavutil/channel_layout.h" | ||
| 23 | #include "avformat.h" | 24 | #include "avformat.h" |
| 24 | #include "internal.h" | 25 | #include "internal.h" |
| 25 | #include "avio_internal.h" | 26 | #include "avio_internal.h" |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | #include "internal.h" | 24 | #include "internal.h" |
| 25 | #include "libavutil/intreadwrite.h" | 25 | #include "libavutil/intreadwrite.h" |
| 26 | #include "libavutil/avassert.h" | 26 | #include "libavutil/avassert.h" |
| 27 | #include "libavutil/channel_layout.h" | ||
| 27 | #include "libavutil/internal.h" | 28 | #include "libavutil/internal.h" |
| 28 | 29 | ||
| 29 | #define IMX_TAG MKTAG('I', 'M', 'A', 'X') | 30 | #define IMX_TAG MKTAG('I', 'M', 'A', 'X') |
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | #include "libavcodec/mpeg4audio.h" | 27 | #include "libavcodec/mpeg4audio.h" |
| 28 | #include "libavcodec/mpegaudiodata.h" | 28 | #include "libavcodec/mpegaudiodata.h" |
| 29 | #include "libavutil/avstring.h" | 29 | #include "libavutil/avstring.h" |
| 30 | #include "libavutil/channel_layout.h" | ||
| 30 | #include "libavutil/intreadwrite.h" | 31 | #include "libavutil/intreadwrite.h" |
| 31 | 32 | ||
| 32 | /* http://www.mp4ra.org */ | 33 | /* http://www.mp4ra.org */ |
| @@ -19,6 +19,8 @@ · 18 unmodified lines | |||
| 19 | * License along with FFmpeg; if not, write to the Free Software | 19 | * License along with FFmpeg; if not, write to the Free Software |
| 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | |||
| 23 | #include "libavutil/channel_layout.h" | ||
| 22 | #include "avformat.h" | 24 | #include "avformat.h" |
| 23 | #include "internal.h" | 25 | #include "internal.h" |
| 24 | #include "rawenc.h" | 26 | #include "rawenc.h" |
| @@ -31,6 +31,7 @@ · 30 unmodified lines | |||
| 31 | #endif | 31 | #endif |
| 32 | 32 | ||
| 33 | #include "libavutil/avstring.h" | 33 | #include "libavutil/avstring.h" |
| 34 | #include "libavutil/channel_layout.h" | ||
| 34 | #include "libavutil/opt.h" | 35 | #include "libavutil/opt.h" |
| 35 | #include "avformat.h" | 36 | #include "avformat.h" |
| 36 | #include "internal.h" | 37 | #include "internal.h" |
| @@ -43,6 +43,7 @@ · 42 unmodified lines | |||
| 43 | #include "libavcodec/raw.h" | 43 | #include "libavcodec/raw.h" |
| 44 | #include "internal.h" | 44 | #include "internal.h" |
| 45 | #include "libavutil/avstring.h" | 45 | #include "libavutil/avstring.h" |
| 46 | #include "libavutil/channel_layout.h" | ||
| 46 | #include "libavutil/intfloat.h" | 47 | #include "libavutil/intfloat.h" |
| 47 | #include "libavutil/mathematics.h" | 48 | #include "libavutil/mathematics.h" |
| 48 | #include "libavutil/libm.h" | 49 | #include "libavutil/libm.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/channel_layout.h" | ||
| 22 | #include "avformat.h" | 23 | #include "avformat.h" |
| 23 | #include "avio_internal.h" | 24 | #include "avio_internal.h" |
| 24 | #include "internal.h" | 25 | #include "internal.h" |
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include "internal.h" | 23 | #include "internal.h" |
| 24 | #include "libavutil/intreadwrite.h" | 24 | #include "libavutil/intreadwrite.h" |
| 25 | #include "libavutil/avassert.h" | 25 | #include "libavutil/avassert.h" |
| 26 | #include "libavutil/channel_layout.h" | ||
| 26 | #include "libavutil/internal.h" | 27 | #include "libavutil/internal.h" |
| 27 | 28 | ||
| 28 | #define PP_BNK_MAX_READ_SIZE 4096 | 29 | #define PP_BNK_MAX_READ_SIZE 4096 |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/channel_layout.h" | ||
| 22 | #include "libavutil/dict.h" | 23 | #include "libavutil/dict.h" |
| 23 | #include "libavutil/log.h" | 24 | #include "libavutil/log.h" |
| 24 | #include "libavutil/mathematics.h" | 25 | #include "libavutil/mathematics.h" |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | #include <stdio.h> | 22 | #include <stdio.h> |
| 23 | #include <stdlib.h> | 23 | #include <stdlib.h> |
| 24 | #include <time.h> | 24 | #include <time.h> |
| 25 | #include "libavutil/channel_layout.h" | ||
| 25 | #include "libavutil/intreadwrite.h" | 26 | #include "libavutil/intreadwrite.h" |
| 26 | #include "libavutil/log.h" | 27 | #include "libavutil/log.h" |
| 27 | #include "libavutil/opt.h" | 28 | #include "libavutil/opt.h" |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | 22 | ||
| 23 | #include "libavutil/intreadwrite.h" | 23 | #include "libavutil/intreadwrite.h" |
| 24 | #include "libavutil/avassert.h" | 24 | #include "libavutil/avassert.h" |
| 25 | #include "libavutil/channel_layout.h" | ||
| 25 | #include "libavutil/internal.h" | 26 | #include "libavutil/internal.h" |
| 26 | #include "avformat.h" | 27 | #include "avformat.h" |
| 27 | #include "internal.h" | 28 | #include "internal.h" |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavutil/channel_layout.h" | ||
| 22 | #include "libavutil/intreadwrite.h" | 23 | #include "libavutil/intreadwrite.h" |
| 23 | #include "libavutil/timecode.h" | 24 | #include "libavutil/timecode.h" |
| 24 | #include "avformat.h" | 25 | #include "avformat.h" |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "libavutil/channel_layout.h" | ||
| 21 | #include "libavutil/opt.h" | 22 | #include "libavutil/opt.h" |
| 22 | #include "swresample_internal.h" | 23 | #include "swresample_internal.h" |
| 23 | 24 | ||
| @@ -20,6 +20,7 @@ · 19 unmodified lines | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "swresample_internal.h" | 22 | #include "swresample_internal.h" |
| 23 | #include "libavutil/channel_layout.h" | ||
| 23 | #include "libavutil/frame.h" | 24 | #include "libavutil/frame.h" |
| 24 | #include "libavutil/opt.h" | 25 | #include "libavutil/opt.h" |
| 25 | 26 | ||
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include "libavcodec/avcodec.h" | 30 | #include "libavcodec/avcodec.h" |
| 31 | #include "libavutil/channel_layout.h" | ||
| 31 | #include "libavutil/common.h" | 32 | #include "libavutil/common.h" |
| 32 | #include "libavutil/samplefmt.h" | 33 | #include "libavutil/samplefmt.h" |
| 33 | 34 | ||