[SCM] libav/experimental: Fix doxy and assert().

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:01:35 UTC 2013


The following commit has been merged in the experimental branch:
commit 3393bff10d81fecc7e0ae702a038e315a8284301
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Feb 24 22:05:51 2010 +0000

    Fix doxy and assert().
    
    Originally committed as revision 22040 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/rectangle.h b/libavcodec/rectangle.h
index a367343..e26d70f 100644
--- a/libavcodec/rectangle.h
+++ b/libavcodec/rectangle.h
@@ -37,11 +37,11 @@
  * fill a rectangle.
  * @param h height of the rectangle, should be a constant
  * @param w width of the rectangle, should be a constant
- * @param size the size of val (1 or 4), should be a constant
+ * @param size the size of val (1, 2 or 4), should be a constant
  */
 static av_always_inline void fill_rectangle(void *vp, int w, int h, int stride, uint32_t val, int size){
     uint8_t *p= (uint8_t*)vp;
-    assert(size==1 || size==4);
+    assert(size==1 || size==2 || size==4);
     assert(w<=4);
 
     w      *= size;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list