Bump version and update APIchanges after r25210.

[ffmpeg] / libavcodec / r210dec.c

diff --git a/libavcodec/r210dec.c b/libavcodec/r210dec.c
index 0b100e5f7df2110d8a44f5d9107d427d1313b251..b1fe62d725335fbfbbb760c3c72727eb1efa052f 100644 (file)
--- a/libavcodec/r210dec.c
+++ b/libavcodec/r210dec.c
@@ -61,11 +61,17 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     for (h = 0; h < avctx->height; h++) {
         uint16_t *dst = (uint16_t *)dst_line;
         for (w = 0; w < avctx->width; w++) {
-            uint32_t pixel = be2me_32(*src++);
+            uint32_t pixel = av_be2ne32(*src++);
             uint16_t r, g, b;
-            b =  pixel <<  6;
-            g = (pixel >>  4) & 0xffc0;
-            r = (pixel >> 14) & 0xffc0;
+            if (avctx->codec_id==CODEC_ID_R210) {
+                b =  pixel <<  6;
+                g = (pixel >>  4) & 0xffc0;
+                r = (pixel >> 14) & 0xffc0;
+            } else {
+                b =  pixel <<  4;
+                g = (pixel >>  6) & 0xffc0;
+                r = (pixel >> 16) & 0xffc0;
+            }
             *dst++ = r | (r >> 10);
             *dst++ = g | (g >> 10);
             *dst++ = b | (b >> 10);
@@ -90,9 +96,10 @@ static av_cold int decode_close(AVCodecContext *avctx)
     return 0;
 }
 
+#if CONFIG_R210_DECODER
 AVCodec r210_decoder = {
     "r210",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_R210,
     0,
     decode_init,
@@ -102,3 +109,18 @@ AVCodec r210_decoder = {
     CODEC_CAP_DR1,
     .long_name = NULL_IF_CONFIG_SMALL("Uncompressed RGB 10-bit"),
 };
+#endif
+#if CONFIG_R10K_DECODER
+AVCodec r10k_decoder = {
+    "r10k",
+    AVMEDIA_TYPE_VIDEO,
+    CODEC_ID_R10K,
+    0,
+    decode_init,
+    NULL,
+    decode_close,
+    decode_frame,
+    CODEC_CAP_DR1,
+    .long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"),
+};
+#endif