dca: Move ff_dca_convert_bitstream() to the DCA common code

[ffmpeg] / avconv_filter.c

diff --git a/avconv_filter.c b/avconv_filter.c
index 9cef1afc8ac87ec3220991b6cd9b526441f8636a..2065cb008b3f5ee0a596003034c3752304a8abef 100644 (file)
--- a/avconv_filter.c
+++ b/avconv_filter.c
@@ -41,7 +41,7 @@ static char *choose_ ## var ## s(OutputStream *ost)                            \
     if (ost->st->codec->var != none) {                                         \
         get_name(ost->st->codec->var);                                         \
         return av_strdup(name);                                                \
-    } else if (ost->enc->supported_list) {                                     \
+    } else if (ost->enc && ost->enc->supported_list) {                         \
         const type *p;                                                         \
         AVIOContext *s = NULL;                                                 \
         uint8_t *ret;                                                          \
@@ -507,7 +507,6 @@ int configure_filtergraph(FilterGraph *fg)
         OutputStream *ost = fg->outputs[0]->ost;
         char args[512];
         AVDictionaryEntry *e = NULL;
-        const AVClass *rc = avresample_get_class();
 
         snprintf(args, sizeof(args), "flags=0x%X", (unsigned)ost->sws_flags);
         fg->graph->scale_sws_opts = av_strdup(args);