[FFmpeg-cvslog] r23321 - in branches/0.6: . libavcodec/avcodec.h

[siretart]

Author: siretart
Date: Tue May 25 20:34:19 2010
New Revision: 23321

Log:
Document CODEC_FLAG_EMU_EDGE and avcodec_align_dimensions interaction.


backport r23258 by reimar

Modified:
   branches/0.6/   (props changed)
   branches/0.6/libavcodec/avcodec.h

Modified: branches/0.6/libavcodec/avcodec.h
==============================================================================
--- branches/0.6/libavcodec/avcodec.h	Tue May 25 20:33:38 2010	(r23320)
+++ branches/0.6/libavcodec/avcodec.h	Tue May 25 20:34:19 2010	(r23321)
@@ -3303,12 +3303,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]);