opus: qualify libavcodec include paths

Removes the special -I flag specified in the avcodec/opus/ subdirectory.

This makes code copy-pastable to other parts of the ffmpeg codebase, as
well as simplifying the build script.

It also reduces ambiguity, since there are many instances of same-named
header files existing in both libavformat/ and libavcodec/
subdirectories.

Follows: b29bdd3715

libavcodec/opus/Makefile

@@ -30,5 +30,3 @@ OBJS-$(CONFIG_OPUS_ENCODER) +=  \
 
 STLIBOBJS-$(CONFIG_MATROSKA_MUXER)   += opus/frame_duration_tab.o
 STLIBOBJS-$(CONFIG_WEBM_MUXER)       += opus/frame_duration_tab.o
-
-libavcodec/opus/%.o: CPPFLAGS += -I$(SRC_PATH)/libavcodec/

libavcodec/opus/dec.c

@@ -47,9 +47,10 @@
 
 #include "libswresample/swresample.h"
 
-#include "avcodec.h"
-#include "codec_internal.h"
-#include "decode.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/codec_internal.h"
+#include "libavcodec/decode.h"
+
 #include "opus.h"
 #include "tab.h"
 #include "celt.h"

libavcodec/opus/enc.c

@@ -21,7 +21,6 @@
 
 #include <float.h>
 
-#include "encode.h"
 #include "enc.h"
 #include "pvq.h"
 #include "enc_psy.h"
@@ -32,9 +31,11 @@
 #include "libavutil/mem.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
-#include "bytestream.h"
-#include "audio_frame_queue.h"
-#include "codec_internal.h"
+
+#include "libavcodec/audio_frame_queue.h"
+#include "libavcodec/bytestream.h"
+#include "libavcodec/codec_internal.h"
+#include "libavcodec/encode.h"
 
 typedef struct OpusEncContext {
     AVClass *av_class;

libavcodec/opus/parse.c

@@ -31,13 +31,14 @@
 #include "libavutil/log.h"
 #include "libavutil/mem.h"
 
-#include "avcodec.h"
-#include "internal.h"
-#include "mathops.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/internal.h"
+#include "libavcodec/mathops.h"
+#include "libavcodec/vorbis_data.h"
+
 #include "opus.h"
 #include "parse.h"
 #include "tab.h"
-#include "vorbis_data.h"
 
 /**
  * Read a 1- or 2-byte frame length

libavcodec/opus/parser.c

@@ -26,12 +26,14 @@
  */
 
 #include "libavutil/mem.h"
-#include "avcodec.h"
-#include "bytestream.h"
+
+#include "libavcodec/avcodec.h"
+#include "libavcodec/bytestream.h"
+#include "libavcodec/parser.h"
+#include "libavcodec/parser_internal.h"
+
 #include "opus.h"
 #include "parse.h"
-#include "parser.h"
-#include "parser_internal.h"
 
 typedef struct OpusParserContext {
     ParseContext pc;

libavcodec/opus/pvq.c

@@ -28,7 +28,7 @@
 #include "config_components.h"
 
 #include "libavutil/mem.h"
-#include "mathops.h"
+#include "libavcodec/mathops.h"
 #include "tab.h"
 #include "pvq.h"
 

libavcodec/opus/silk.c

@@ -27,7 +27,9 @@
 #include <stdint.h>
 
 #include "libavutil/mem.h"
-#include "mathops.h"
+
+#include "libavcodec/mathops.h"
+
 #include "opus.h"
 #include "rc.h"
 #include "silk.h"