Adjust ffmpeg/libav #includes to work with recent upstream changes

The <libavutil/avutil.h> stopped including <libavutil/common.h>
recursively in recent ffmpeg/libav git revisions. As a result, some
files no longer got needed definitions, causing a build failure.
Modify #include lines in various files to fix build with the latest
versions of ffmpeg/libav headers.

bstr.c

@@ -17,11 +17,12 @@
  */
 
 #include <string.h>
-#include <libavutil/avutil.h>
 #include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>
 
+#include <libavutil/common.h>
+
 #include "talloc.h"
 
 #include "bstr.h"

libaf/af_lavcac3enc.c

@@ -28,6 +28,7 @@
 
 #include <libavcodec/avcodec.h>
 #include <libavutil/intreadwrite.h>
+#include <libavutil/mem.h>
 
 #include "config.h"
 #include "af.h"

libao2/ao_portaudio.c

@@ -22,7 +22,7 @@
 #include <assert.h>
 #include <pthread.h>
 
-#include <libavutil/avutil.h>
+#include <libavutil/common.h>
 #include <portaudio.h>
 
 #include "config.h"

libmpcodecs/vf.c

@@ -21,6 +21,8 @@
 #include <string.h>
 #include <assert.h>
 #include <sys/types.h>
+#include <libavutil/common.h>
+#include <libavutil/mem.h>
 
 #include "config.h"
 
@@ -34,7 +36,6 @@
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
-#include "libavutil/mem.h"
 
 extern const vf_info_t vf_info_vo;
 extern const vf_info_t vf_info_rectangle;

libmpcodecs/vf_expand.c

@@ -21,6 +21,8 @@
 #include <string.h>
 #include <stdbool.h>
 
+#include <libavutil/common.h>
+
 #include "config.h"
 #include "mp_msg.h"
 #include "options.h"
@@ -30,7 +32,6 @@
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
-#include "libavutil/avutil.h"
 
 #include "m_option.h"
 #include "m_struct.h"

libmpcodecs/vf_geq.c

@@ -24,6 +24,9 @@
 #include <math.h>
 #include <inttypes.h>
 
+#include <libavutil/eval.h>
+#include <libavutil/common.h>
+
 #include "config.h"
 
 #include "mp_msg.h"
@@ -33,9 +36,6 @@
 #include "mp_image.h"
 #include "vf.h"
 
-#include "libavcodec/avcodec.h"
-#include "libavutil/eval.h"
-
 struct vf_priv_s {
     AVExpr * e[3];
     int framenum;

libmpcodecs/vf_gradfun.c

@@ -33,13 +33,14 @@
 #include <inttypes.h>
 #include <math.h>
 
+#include <libavutil/common.h>
+
 #include "config.h"
 #include "cpudetect.h"
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 #include "libvo/fastmemcpy.h"
-#include "libavutil/avutil.h"
 #include "ffmpeg_files/x86_cpu.h"
 
 #include "m_option.h"

libmpcodecs/vf_qp.c

@@ -25,6 +25,7 @@
 #include <inttypes.h>
 
 #include <libavutil/eval.h>
+#include <libavutil/mem.h>
 
 #include "mp_msg.h"
 #include "cpudetect.h"

libmpcodecs/vf_sab.c

@@ -24,14 +24,16 @@
 #include <inttypes.h>
 #include <assert.h>
 
+#include <libavutil/mem.h>
+#include <libavutil/common.h>
+#include <libswscale/swscale.h>
+
 #include "config.h"
 #include "mp_msg.h"
 
-#include "libavutil/avutil.h"
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "libswscale/swscale.h"
 #include "vf_scale.h"
 
 

libmpcodecs/vf_uspp.c

@@ -25,13 +25,14 @@
 #include <math.h>
 #include <assert.h>
 
+#include <libavcodec/avcodec.h>
+#include <libavutil/mem.h>
+
 #include "config.h"
 
 #include "mp_msg.h"
 #include "cpudetect.h"
 
-#include "libavcodec/avcodec.h"
-
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"

libvo/vo_gl3.c

@@ -29,7 +29,7 @@
 #include <assert.h>
 #include "config.h"
 
-#include <libavutil/avutil.h>
+#include <libavutil/common.h>
 
 #ifdef CONFIG_LCMS2
 #include <lcms2.h>

stream/cache2.c

@@ -16,8 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
-
 // Initial draft of my new cache system...
 // Note it runs in 2 processes (using fork()), but doesn't require locking!!
 // TODO: seeking, data consistency checking
@@ -39,7 +37,10 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "libavutil/avutil.h"
+#include <libavutil/common.h>
+
+#include "config.h"
+
 #include "osdep/shmem.h"
 #include "osdep/timer.h"
 #if defined(__MINGW32__)

sub/spudec.c

@@ -35,7 +35,7 @@
 #include <string.h>
 #include <math.h>
 
-#include <libavutil/avutil.h>
+#include <libavutil/common.h>
 #include <libavutil/intreadwrite.h>
 #include <libswscale/swscale.h>