Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Side by Side Diff: patched-ffmpeg-mt/libavutil/avutil.h

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> 2 * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
3 * 3 *
4 * This file is part of FFmpeg. 4 * This file is part of FFmpeg.
5 * 5 *
6 * FFmpeg is free software; you can redistribute it and/or 6 * FFmpeg is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Lesser General Public 7 * modify it under the terms of the GNU Lesser General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2.1 of the License, or (at your option) any later version. 9 * version 2.1 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 22 matching lines...) Expand all
33 #define AV_GLUE(a, b) a ## b 33 #define AV_GLUE(a, b) a ## b
34 #define AV_JOIN(a, b) AV_GLUE(a, b) 34 #define AV_JOIN(a, b) AV_GLUE(a, b)
35 35
36 #define AV_PRAGMA(s) _Pragma(#s) 36 #define AV_PRAGMA(s) _Pragma(#s)
37 37
38 #define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c) 38 #define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
39 #define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c 39 #define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
40 #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) 40 #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
41 41
42 #define LIBAVUTIL_VERSION_MAJOR 50 42 #define LIBAVUTIL_VERSION_MAJOR 50
43 #define LIBAVUTIL_VERSION_MINOR 8 43 #define LIBAVUTIL_VERSION_MINOR 11
44 #define LIBAVUTIL_VERSION_MICRO 0 44 #define LIBAVUTIL_VERSION_MICRO 0
45 45
46 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ 46 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
47 LIBAVUTIL_VERSION_MINOR, \ 47 LIBAVUTIL_VERSION_MINOR, \
48 LIBAVUTIL_VERSION_MICRO) 48 LIBAVUTIL_VERSION_MICRO)
49 #define LIBAVUTIL_VERSION AV_VERSION(LIBAVUTIL_VERSION_MAJOR, \ 49 #define LIBAVUTIL_VERSION AV_VERSION(LIBAVUTIL_VERSION_MAJOR, \
50 LIBAVUTIL_VERSION_MINOR, \ 50 LIBAVUTIL_VERSION_MINOR, \
51 LIBAVUTIL_VERSION_MICRO) 51 LIBAVUTIL_VERSION_MICRO)
52 #define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT 52 #define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT
53 53
(...skipping 15 matching lines...) Expand all
69 const char *avutil_license(void); 69 const char *avutil_license(void);
70 70
71 #include "common.h" 71 #include "common.h"
72 #include "mathematics.h" 72 #include "mathematics.h"
73 #include "rational.h" 73 #include "rational.h"
74 #include "intfloat_readwrite.h" 74 #include "intfloat_readwrite.h"
75 #include "log.h" 75 #include "log.h"
76 #include "pixfmt.h" 76 #include "pixfmt.h"
77 77
78 #endif /* AVUTIL_AVUTIL_H */ 78 #endif /* AVUTIL_AVUTIL_H */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698