dnxhd 185 interlaced support

Originally committed as revision 9901 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 16 insertions, 18 deletions

diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h
index eea66fc..9a06b55 100644
--- a/libavcodec/dnxhddata.h
+++ b/libavcodec/dnxhddata.h
@@ -46,28 +46,26 @@ static const uint8_t dnxhd_1238_chroma_weigth[] = {
     82, 77, 80, 86, 84, 82, 82, 82,
 };
 
-/* FIXME permute */
 static const uint8_t dnxhd_1243_luma_weigth[] = {
-     0,32,35,35,38,40,44,45,
-    32,33,35,35,39,42,44,45,
-    33,35,34,37,41,42,45,45,
-    35,35,37,40,41,44,45,48,
-    35,37,38,40,43,45,47,48,
-    36,36,38,40,45,47,48,47,
-    35,36,38,41,45,46,47,48,
-    36,37,39,41,44,45,47,47,
+     0, 32, 32, 33, 33, 35, 35, 35,
+    35, 35, 35, 35, 34, 35, 38, 40,
+    39, 37, 37, 37, 36, 35, 36, 38,
+    40, 41, 42, 44, 45, 44, 42, 41,
+    40, 38, 36, 36, 37, 38, 40, 43,
+    44, 45, 45, 45, 45, 45, 45, 41,
+    39, 41, 45, 47, 47, 48, 48, 48,
+    46, 44, 45, 47, 47, 48, 47, 47,
 };
 
-/* FIXME permute */
 static const uint8_t dnxhd_1243_chroma_weigth[] = {
-     0,32,37,39,41,42,45,45,
-    36,36,39,41,43,45,46,45,
-    37,41,41,43,45,44,45,46,
-    43,42,43,46,44,45,46,48,
-    43,44,47,45,44,46,47,49,
-    44,46,44,45,45,47,48,47,
-    44,42,46,44,45,46,47,48,
-    41,43,45,44,45,46,47,47,
+     0, 32, 36, 37, 36, 37, 39, 39,
+    41, 43, 43, 42, 41, 41, 41, 42,
+    43, 43, 43, 44, 44, 44, 46, 47,
+    46, 45, 45, 45, 45, 46, 44, 44,
+    45, 44, 42, 41, 43, 46, 45, 44,
+    45, 45, 45, 46, 46, 46, 45, 44,
+    45, 44, 45, 47, 47, 48, 49, 48,
+    46, 45, 46, 47, 47, 48, 47, 47,
 };
 
 static const uint8_t dnxhd_1238_dc_codes[12] = {