This way pixdescs can be used without requiring a dependency on libavcodec. Originally committed as revision 20389 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | −#include "libavutil/pixfmt.h" | |
| 22 | +#include "pixfmt.h" | |
| 23 | 23 | #include "pixdesc.h" |
| 24 | 24 | |
| 25 | 25 | const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { |
| @@ -19,12 +19,12 @@ · 18 unmodified lines | ||
| 19 | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | −#ifndef AVCODEC_PIXDESC_H | |
| 23 | −#define AVCODEC_PIXDESC_H | |
| 22 | +#ifndef AVUTIL_PIXDESC_H | |
| 23 | +#define AVUTIL_PIXDESC_H | |
| 24 | 24 | |
| 25 | 25 | #include <inttypes.h> |
| 26 | 26 | |
| 27 | −#include "libavutil/intreadwrite.h" | |
| 27 | +#include "intreadwrite.h" | |
| 28 | 28 | |
| 29 | 29 | typedef struct AVComponentDescriptor{ |
| 30 | 30 | uint16_t plane :2; ///< which of the 4 planes contains the component |
| @@ -204,4 +204,4 @@ static inline void write_line(const uint16_t *src, uint8_t *data[4], const int l · 173 unmodified lines | ||
| 204 | 204 | */ |
| 205 | 205 | int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc); |
| 206 | 206 | |
| 207 | −#endif /* AVCODEC_PIXDESC_H */ | |
| 207 | +#endif /* AVUTIL_PIXDESC_H */ | |