aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2010-05-23 15:34:39 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2010-05-23 15:34:39 +0000
commit6d9b7a7dab00324943f84e1dd5eddbad088be80d (patch)
tree6af7334afd0c552c91999bf62eb7a9f0317b0076
parent944a1b6b96effbca8f721f60b2d8019f476b15d0 (diff)
downloadffmpeg-6d9b7a7dab00324943f84e1dd5eddbad088be80d.tar.gz
Document CODEC_FLAG_EMU_EDGE and avcodec_align_dimensions interaction.
Originally committed as revision 23258 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/avcodec.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 8781c0a452..cd642ac876 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3316,12 +3316,20 @@ 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
* padding.
+ *
+ * May only be used if a codec with CODEC_CAP_DR1 has been opened.
+ * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
+ * according to avcodec_get_edge_width() before.
*/
void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
/**
* Modifies width and height values so that they will result in a memory
* buffer that is acceptable for the codec if you also ensure that all
* line sizes are a multiple of the respective linesize_align[i].
+ *
+ * May only be used if a codec with CODEC_CAP_DR1 has been opened.
+ * If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
+ * according to avcodec_get_edge_width() before.
*/
void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
int linesize_align[4]);