Browse code

lavu: remove FF_API_OLD_IMAGE_NAMES cruft

Anton Khirnov authored on 2011/04/13 04:11:15
Showing 3 changed files
... ...
@@ -94,14 +94,6 @@ enum AVMediaType {
94 94
 #define AV_TIME_BASE            1000000
95 95
 #define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
96 96
 
97
-/**
98
- * Those FF_API_* defines are not part of public API.
99
- * They may change, break or disappear at any time.
100
- */
101
-#ifndef FF_API_OLD_IMAGE_NAMES
102
-#define FF_API_OLD_IMAGE_NAMES (LIBAVUTIL_VERSION_MAJOR < 51)
103
-#endif
104
-
105 97
 #include "common.h"
106 98
 #include "error.h"
107 99
 #include "mathematics.h"
... ...
@@ -266,32 +266,3 @@ void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
266 266
         }
267 267
     }
268 268
 }
269
-
270
-#if FF_API_OLD_IMAGE_NAMES
271
-void av_fill_image_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
272
-                                const AVPixFmtDescriptor *pixdesc)
273
-{
274
-    av_image_fill_max_pixsteps(max_pixsteps, max_pixstep_comps, pixdesc);
275
-}
276
-
277
-int av_get_image_linesize(enum PixelFormat pix_fmt, int width, int plane)
278
-{
279
-    return av_image_get_linesize(pix_fmt, width, plane);
280
-}
281
-
282
-int av_fill_image_linesizes(int linesizes[4], enum PixelFormat pix_fmt, int width)
283
-{
284
-    return av_image_fill_linesizes(linesizes, pix_fmt, width);
285
-}
286
-
287
-int av_fill_image_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int height,
288
-                           uint8_t *ptr, const int linesizes[4])
289
-{
290
-    return av_image_fill_pointers(data, pix_fmt, height, ptr, linesizes);
291
-}
292
-
293
-int av_check_image_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx)
294
-{
295
-    return av_image_check_size(w, h, log_offset, log_ctx);
296
-}
297
-#endif
... ...
@@ -127,23 +127,4 @@ int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *lo
127 127
 
128 128
 int ff_set_systematic_pal2(uint32_t pal[256], enum PixelFormat pix_fmt);
129 129
 
130
-#if FF_API_OLD_IMAGE_NAMES
131
-attribute_deprecated
132
-void av_fill_image_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
133
-                                const AVPixFmtDescriptor *pixdesc);
134
-
135
-attribute_deprecated
136
-int av_get_image_linesize(enum PixelFormat pix_fmt, int width, int plane);
137
-
138
-attribute_deprecated
139
-int av_fill_image_linesizes(int linesizes[4], enum PixelFormat pix_fmt, int width);
140
-
141
-attribute_deprecated
142
-int av_fill_image_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int height,
143
-                           uint8_t *ptr, const int linesizes[4]);
144
-
145
-attribute_deprecated
146
-int av_check_image_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
147
-#endif
148
-
149 130
 #endif /* AVUTIL_IMGUTILS_H */