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

[conrad]

Author: conrad
Date: Tue Nov 11 09:38:05 2008
New Revision: 3810

Log:
Remove aspect_ratio from dirac_source_params and set it in AVCodecContext instead


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

Modified: dirac/libavcodec/dirac.c
==============================================================================
--- dirac/libavcodec/dirac.c	(original)
+++ dirac/libavcodec/dirac.c	Tue Nov 11 09:38:05 2008
@@ -226,12 +226,12 @@ static int parse_source_parameters(AVCod
             return -1;
 
         if (! s->source.aspect_ratio_index) {
-            s->source.aspect_ratio.num = svq3_get_ue_golomb(gb);
-            s->source.aspect_ratio.den = svq3_get_ue_golomb(gb);
+            avctx->sample_aspect_ratio.num = svq3_get_ue_golomb(gb);
+            avctx->sample_aspect_ratio.den = svq3_get_ue_golomb(gb);
         }
     }
     if (s->source.aspect_ratio_index > 0 && s->source.aspect_ratio_index <= 6)
-        s->source.aspect_ratio =
+        avctx->sample_aspect_ratio =
                 dirac_preset_aspect_ratios[s->source.aspect_ratio_index-1];
 
     /* Override clean area. */

Modified: dirac/libavcodec/dirac.h
==============================================================================
--- dirac/libavcodec/dirac.h	(original)
+++ dirac/libavcodec/dirac.h	Tue Nov 11 09:38:05 2008
@@ -95,8 +95,6 @@ typedef struct {
     unsigned int luma_depth;
     unsigned int chroma_depth;
 
-    AVRational aspect_ratio;
-
     /* luma and chroma offsets */
     uint16_t luma_offset;
     uint16_t luma_excursion;