[SCM] libav/experimental: Document CODEC_FLAG_EMU_EDGE and avcodec_align_dimensions interaction.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6d9b7a7dab00324943f84e1dd5eddbad088be80d
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Sun May 23 15:34:39 2010 +0000

    Document CODEC_FLAG_EMU_EDGE and avcodec_align_dimensions interaction.
    
    Originally committed as revision 23258 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 8781c0a..cd642ac 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]);

-- 
Libav/FFmpeg packaging