diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2012-10-10 22:21:57 +0300 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2012-10-14 21:27:02 +0200 |
| commit | 977116a0ca30351531c1fac482f149e7d7af6f53 (patch) | |
| tree | 0a7cc769d3e996949a343c806f6df18cb87e78fd /fmt-conversion.h | |
| parent | 85d185441acf4691c830db2f40235ac927410d45 (diff) | |
| download | mpv-977116a0ca30351531c1fac482f149e7d7af6f53.tar.bz2 mpv-977116a0ca30351531c1fac482f149e7d7af6f53.tar.xz | |
fmt-conversion.h: fix pixfmt.h #include; fixes latest Libav
Change fmt-conversion.h to include <libavutil/pixfmt.h> instead of
<libavutil/avutil.h> which no longer indirectly includes the former.
This fixes compilation with latest Libav. Also remove superfluous
config.h #include.
The pixfmt.h #include is needed for 'enum PixelFormat'. avutil.h
already stopped including pixfmt.h more than a year ago, but that did
not cause visible breakage at the time. AFAIK the C standard does not
allow incomplete enum types, but it seems that GCC and other relevant
compilers accept function declarations using not-yet-defined enum
types without warnings. However, Libav now renamed 'enum PixelFormat'
to 'enum AVPixelFormat', adding a '#define PixelFormat AVPixelFormat'
for backwards compatibility. We need this compatibility define because
we're still using the PixelFormat name, but it of course does not work
if pixfmt.h is not included; thus the missing include now caused a
compilation failure.
Diffstat (limited to 'fmt-conversion.h')
| -rw-r--r-- | fmt-conversion.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fmt-conversion.h b/fmt-conversion.h index 9e133a8222..f7114b0aef 100644 --- a/fmt-conversion.h +++ b/fmt-conversion.h @@ -19,8 +19,7 @@ #ifndef MPLAYER_FMT_CONVERSION_H #define MPLAYER_FMT_CONVERSION_H -#include "config.h" -#include "libavutil/avutil.h" +#include <libavutil/pixfmt.h> enum PixelFormat imgfmt2pixfmt(int fmt); int pixfmt2imgfmt(enum PixelFormat pix_fmt); |