diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-26 01:20:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-26 01:22:39 +0200 |
| commit | fa2d3b6dbe0ed507ae3d19038f9a46e8e9a72b70 (patch) | |
| tree | 8148f4566b180d2e41f77418d7b696a406dd9a60 /libavcodec/vaapi_mpeg2.c | |
| parent | 7b94a2f4b183ff0a02a40e4ce41273d5aede54eb (diff) | |
| parent | 5aed1d4240d411533c102eec6944aa925b7f4964 (diff) | |
Merge commit '5aed1d4240d411533c102eec6944aa925b7f4964'
* commit '5aed1d4240d411533c102eec6944aa925b7f4964':
vaapi: Fix -Wimplicit-function-declaration for ff_dlog() usage
See: 8f7b022c8c2f40bf8ddfd90778a4c91424d3a8e5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vaapi_mpeg2.c')
| -rw-r--r-- | libavcodec/vaapi_mpeg2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c index 7bebedb521..87fab89880 100644 --- a/libavcodec/vaapi_mpeg2.c +++ b/libavcodec/vaapi_mpeg2.c @@ -20,9 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "internal.h" #include "mpegutils.h" #include "vaapi_internal.h" +#include "internal.h" /** Reconstruct bitstream f_code */ static inline int mpeg2_get_f_code(MpegEncContext *s) |