diff options
| author | Bobby Bingham <uhmmmm@gmail.com> | 2010-04-01 06:41:16 +0000 |
|---|---|---|
| committer | Bobby Bingham <uhmmmm@gmail.com> | 2010-04-01 06:41:16 +0000 |
| commit | 0fb49b597be60efb84bb39c09576baecc1471eeb (patch) | |
| tree | 2cab1b3398a3650e2f4c99914c0d2e8cc340de0b | |
| parent | c846a984dc331286b9c31bdb26f7edbbcfdbd6c0 (diff) | |
Add function to export EDGE_WIDTH from libavcodec.
Originally committed as revision 22753 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 11 | ||||
| -rw-r--r-- | libavcodec/utils.c | 5 |
3 files changed, 18 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 90905a10a7..4a31c06e72 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -12,6 +12,9 @@ libavutil: 2009-03-08 API changes, most recent first: +2010-04-01 - r22753 - lavc 52.66.0 + Add avcodec_get_edge_width() + 2010-03-31 - r22750 - lavc 52.65.0 Add avcodec_copy_context(). diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 663af54d08..add4b100ae 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 52 -#define LIBAVCODEC_VERSION_MINOR 65 +#define LIBAVCODEC_VERSION_MINOR 66 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -3290,6 +3290,15 @@ AVFrame *avcodec_alloc_frame(void); int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic); void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic); int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic); + +/** + * Returns the amount of padding in pixels which the get_buffer callback must + * provide around the edge of the image for codecs which do not have the + * CODEC_FLAG_EMU_EDGE flag. + * + * @return Required padding in pixels. + */ +unsigned avcodec_get_edge_width(void); /** * Modifies width and height values so that they will result in a memory * buffer that is acceptable for the codec if you do not use any horizontal diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 0abf07ce62..52aa672541 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -101,6 +101,11 @@ void register_avcodec(AVCodec *codec) } #endif +unsigned avcodec_get_edge_width(void) +{ + return EDGE_WIDTH; +} + void avcodec_set_dimensions(AVCodecContext *s, int width, int height){ s->coded_width = width; s->coded_height= height; |