10l, commit that should have been stashed into the merge.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-17 23:57:50 +02:00
parent c40798441f
commit 2d2b5a1421
31 changed files with 46 additions and 46 deletions
--- a/libavcodec/libdirac.h
+++ b/libavcodec/libdirac.h
@@ -30,7 +30,7 @@
 #include <libdirac_common/dirac_types.h>

 /**
-* Table providing a Dirac chroma format to Libav pixel format mapping.
+* Table providing a Dirac chroma format to FFmpeg pixel format mapping.
 */
 static const struct {
    enum PixelFormat ff_pix_fmt;