avcodec: revert define of deprecated values

[vlc] / modules / codec / realvideo.c

diff --git a/modules/codec/realvideo.c b/modules/codec/realvideo.c
index 1a8160fc2eda1f94fa2177c29e54587529b848b5..c94a8aa4d1649c225502ea12ed2060d0065394d5 100644 (file)
--- a/modules/codec/realvideo.c
+++ b/modules/codec/realvideo.c
@@ -45,13 +45,8 @@ int WINAPI FreeLibrary( void *handle );
 #   define WINAPI
 #endif
 
-#if defined(HAVE_DL_DLOPEN)
-#   if defined(HAVE_DLFCN_H) /* Linux, BSD, Hurd */
-#       include <dlfcn.h>
-#   endif
-#   if defined(HAVE_SYS_DL_H)
-#       include <sys/dl.h>
-#   endif
+#ifndef WIN32
+#   include <dlfcn.h>
 #endif
 
 typedef struct cmsg_data_s
@@ -129,7 +124,7 @@ static picture_t *DecodeVideo( decoder_t *, block_t ** );
 
 vlc_module_begin ()
     set_description( N_("RealVideo library decoder") )
-    set_capability( "decoder", 10 )
+    set_capability( "decoder", 0 )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_VCODEC )
     set_callbacks( Open, Close )
@@ -355,7 +350,8 @@ static int InitVideo(decoder_t *p_dec)
      
     p_dec->fmt_out.video.i_width = p_dec->fmt_in.video.i_width;
     p_dec->fmt_out.video.i_height= p_dec->fmt_in.video.i_height;
-    p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR * p_dec->fmt_in.video.i_width / p_dec->fmt_in.video.i_height;
+    p_dec->fmt_out.video.i_sar_num = 1;
+    p_dec->fmt_out.video.i_sar_den = 1;
     p_sys->inited = 0;
 
     vlc_mutex_unlock( &rm_mutex );
@@ -372,9 +368,6 @@ static int Open( vlc_object_t *p_this )
 {
     decoder_t *p_dec = (decoder_t*)p_this;
 
-    /* create a mutex */
-    var_Create( p_this->p_libvlc, "rm_mutex", VLC_VAR_MUTEX );
-
     switch ( p_dec->fmt_in.i_codec )
     {
     case VLC_CODEC_RV10: 
@@ -468,7 +461,7 @@ static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
         dp_hdr_t dp_hdr;
         transform_in_t transform_in;
         uint32_t pkg_len = ((uint32_t*)p_block->p_buffer)[0];
-        unsigned char* dp_data=((unsigned char*)p_block->p_buffer)+8;
+        char* dp_data=((char*)p_block->p_buffer)+8;
         uint32_t* extra=(uint32_t*)(((char*)p_block->p_buffer)+8+pkg_len);
         uint32_t img_size;
 
@@ -527,7 +520,8 @@ static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
                     p_dec->fmt_out.video.i_visible_height = 
                     p_dec->fmt_in.video.i_height= transform_out[4];
 
-                    p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR * p_dec->fmt_in.video.i_width / p_dec->fmt_in.video.i_height;
+                    p_dec->fmt_out.video.i_sar_num = 1;
+                    p_dec->fmt_out.video.i_sar_den = 1;
                 }
                 else
                 {