Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: allow cropping to AVCodecContext.width/height
  mov: set AVCodecContext.width/height for h264
  iac: generate codec tables as they are supposed to be
  indeo4: handle frame type 1 properly
  lavu: change versioning script to include all av* prefixed symbols

Conflicts:
	libavcodec/h264.c
	libavutil/libavutil.v

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 1 insertions, 1 deletions

diff --git a/libavutil/libavutil.v b/libavutil/libavutil.v
index ab451c5b6d..eb16ae175e 100644
--- a/libavutil/libavutil.v
+++ b/libavutil/libavutil.v
@@ -1,4 +1,4 @@
 LIBAVUTIL_$MAJOR {
-        global: av_*; ff_*; avutil_*; avpriv_*;
+        global: av*; ff_*;
         local: *;
 };