Update references to ffmpeg header files to match new directory structure. All ffmpe...

[vlc] / modules / codec / ffmpeg / encoder.c

diff --git a/modules/codec/ffmpeg/encoder.c b/modules/codec/ffmpeg/encoder.c
index 1275c1c93033ccaa5f692c92c519dcfa2694ca7b..1d5c0c258bf225199e98048eac2ac50ea6b6b84b 100644 (file)
--- a/modules/codec/ffmpeg/encoder.c
+++ b/modules/codec/ffmpeg/encoder.c
@@ -41,8 +41,8 @@
 
 /* ffmpeg header */
 #define HAVE_MMX 1
-#ifdef HAVE_FFMPEG_AVCODEC_H
-#   include <ffmpeg/avcodec.h>
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
+#   include <libavcodec/avcodec.h>
 #else
 #   include <avcodec.h>
 #endif
@@ -163,7 +163,7 @@ static const uint16_t mpa_bitrate_tab[2][15] =
 static const uint16_t mpa_freq_tab[6] =
 { 44100, 48000, 32000, 22050, 24000, 16000 };
 
-static const int16_t mpeg4_default_intra_matrix[64] = {
+static const uint16_t mpeg4_default_intra_matrix[64] = {
   8, 17, 18, 19, 21, 23, 25, 27,
  17, 18, 19, 21, 23, 25, 27, 28,
  20, 21, 22, 23, 24, 26, 28, 30,
@@ -174,7 +174,7 @@ static const int16_t mpeg4_default_intra_matrix[64] = {
  27, 28, 30, 32, 35, 38, 41, 45,
 };
 
-static const int16_t mpeg4_default_non_intra_matrix[64] = {
+static const uint16_t mpeg4_default_non_intra_matrix[64] = {
  16, 17, 18, 19, 20, 21, 22, 23,
  17, 18, 19, 20, 21, 22, 23, 24,
  18, 19, 20, 21, 22, 23, 24, 25,
@@ -502,7 +502,7 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
         if( p_enc->fmt_out.i_bitrate > 0 && p_sys->i_qmax == 0 && p_sys->i_qmin == 0 )
         {
             p_sys->i_qmax = 51;
-            p_sys->i_qmin = 10;
+            p_sys->i_qmin = 3;
         }
 
         if( p_sys->i_qmin > 0 )
@@ -1036,7 +1036,7 @@ void E_(CloseEncoder)( vlc_object_t *p_this )
             vlc_thread_join( pp_contexts[i] );
             vlc_mutex_destroy( &pp_contexts[i]->lock );
             vlc_cond_destroy( &pp_contexts[i]->cond );
-            vlc_object_destroy( pp_contexts[i] );
+            vlc_object_release( pp_contexts[i] );
         }
 
         free( pp_contexts );