[FFmpeg-soc] [soc]: r3791 - in dirac/libavcodec: dirac.c dirac.h

[conrad]

Author: conrad
Date: Mon Nov 10 04:11:55 2008
New Revision: 3791

Log:
Rename source_paramaters to dirac_source_params


Modified:
   dirac/libavcodec/dirac.c
   dirac/libavcodec/dirac.h

Modified: dirac/libavcodec/dirac.c
==============================================================================
--- dirac/libavcodec/dirac.c	(original)
+++ dirac/libavcodec/dirac.c	Mon Nov 10 04:11:55 2008
@@ -38,7 +38,7 @@
 #include "mpeg12data.h"
 
 /* Defaults for source parameters.  */
-const struct source_parameters ff_dirac_source_parameters_defaults[] =
+const dirac_source_params ff_dirac_source_parameters_defaults[] =
 {
     { 640,  480,  2, 0, 0, 1,  1, 640,  480,  0, 0, 1, 0 },
     { 176,  120,  2, 0, 0, 9,  2, 176,  120,  0, 0, 1, 1 },
@@ -130,7 +130,7 @@ static const weights_t eighthpel_weights
  */
 void dirac_dump_source_parameters(AVCodecContext *avctx) {
     DiracContext *s = avctx->priv_data;
-    struct source_parameters *source = &s->source;
+    dirac_source_params *source = &s->source;
     const char *chroma_format_str[] = { "4:4:4", "4:2:2", "4:2:0" };
 
     dprintf(avctx, "-----------------------------------------------------\n");

Modified: dirac/libavcodec/dirac.h
==============================================================================
--- dirac/libavcodec/dirac.h	(original)
+++ dirac/libavcodec/dirac.h	Mon Nov 10 04:11:55 2008
@@ -66,7 +66,7 @@ typedef struct {
          (((size + (1 << depth) - 1) >> depth) << depth)
 
 
-struct source_parameters
+typedef struct
 {
     /* Information about the frames.  */
     unsigned int luma_width;                ///< the luma component width
@@ -108,7 +108,7 @@ struct source_parameters
     color_specification color_spec;
     float k_r;
     float k_b; /* XXX: ??? */
-};
+} dirac_source_params;
 
 struct decoding_parameters
 {
@@ -140,7 +140,7 @@ struct globalmc_parameters {
 };
 
 /* Defaults for sequence parameters.  */
-extern const struct source_parameters ff_dirac_source_parameters_defaults[];
+extern const dirac_source_params ff_dirac_source_parameters_defaults[];
 extern const AVRational ff_dirac_frame_rate[];
 extern const AVRational ff_dirac_preset_aspect_ratios[];
 extern const uint16_t ff_dirac_preset_luma_offset[];
@@ -198,7 +198,7 @@ typedef struct DiracContext {
     uint32_t retireframe[REFFRAME_CNT];
     int16_t *mcpic;
 
-    struct source_parameters source;
+    dirac_source_params source;
     struct decoding_parameters decoding;
 
     unsigned int codeblock_mode;