Originally committed as revision 22753 to svn://svn.ffmpeg.org/ffmpeg/trunk
Bobby Bingham authored on 2010/04/01 15:41:16... | ... |
@@ -30,7 +30,7 @@ |
30 | 30 |
#include "libavutil/avutil.h" |
31 | 31 |
|
32 | 32 |
#define LIBAVCODEC_VERSION_MAJOR 52 |
33 |
-#define LIBAVCODEC_VERSION_MINOR 65 |
|
33 |
+#define LIBAVCODEC_VERSION_MINOR 66 |
|
34 | 34 |
#define LIBAVCODEC_VERSION_MICRO 0 |
35 | 35 |
|
36 | 36 |
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |
... | ... |
@@ -3290,6 +3290,15 @@ AVFrame *avcodec_alloc_frame(void); |
3290 | 3290 |
int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic); |
3291 | 3291 |
void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic); |
3292 | 3292 |
int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic); |
3293 |
+ |
|
3294 |
+/** |
|
3295 |
+ * Returns the amount of padding in pixels which the get_buffer callback must |
|
3296 |
+ * provide around the edge of the image for codecs which do not have the |
|
3297 |
+ * CODEC_FLAG_EMU_EDGE flag. |
|
3298 |
+ * |
|
3299 |
+ * @return Required padding in pixels. |
|
3300 |
+ */ |
|
3301 |
+unsigned avcodec_get_edge_width(void); |
|
3293 | 3302 |
/** |
3294 | 3303 |
* Modifies width and height values so that they will result in a memory |
3295 | 3304 |
* buffer that is acceptable for the codec if you do not use any horizontal |
... | ... |
@@ -101,6 +101,11 @@ void register_avcodec(AVCodec *codec) |
101 | 101 |
} |
102 | 102 |
#endif |
103 | 103 |
|
104 |
+unsigned avcodec_get_edge_width(void) |
|
105 |
+{ |
|
106 |
+ return EDGE_WIDTH; |
|
107 |
+} |
|
108 |
+ |
|
104 | 109 |
void avcodec_set_dimensions(AVCodecContext *s, int width, int height){ |
105 | 110 |
s->coded_width = width; |
106 | 111 |
s->coded_height= height; |