Move av_class to AVResampleContext instead of ReSampleContext.

Fixes issue 852.

Originally committed as revision 18170 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/resample.c b/libavcodec/resample.c
index 829db76..122b725 100644 (file)
--- a/libavcodec/resample.c
+++ b/libavcodec/resample.c
@@ -39,7 +39,6 @@ static const AVOption options[] = {{NULL}};
 static const AVClass audioresample_context_class = { "ReSampleContext", context_to_name, options };
 
 struct ReSampleContext {
-    const AVClass *av_class;
     struct AVResampleContext *resample_context;
     short *temp[2];
     int temp_len;
@@ -213,7 +212,7 @@ ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
     s->resample_context= av_resample_init(output_rate, input_rate,
                          filter_length, log2_phase_count, linear, cutoff);
 
-    s->av_class= &audioresample_context_class;
+    *(AVClass**)s->resample_context = &audioresample_context_class;
 
     return s;
 }

diff --git a/libavcodec/resample2.c b/libavcodec/resample2.c
index ac9db73..31d2be7 100644 (file)
--- a/libavcodec/resample2.c
+++ b/libavcodec/resample2.c
@@ -57,6 +57,7 @@
 
 
 typedef struct AVResampleContext{
+    const AVClass *av_class;
     FELEM *filter_bank;
     int filter_length;
     int ideal_dst_incr;