gen-android-configs: support x86_64 multilib build

[android-x86/external-ffmpeg.git] / ffmpeg_opt.c

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 4720e12..00dab91 100644 (file)
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -89,8 +89,10 @@ const HWAccel hwaccels[] = {
 #endif
     { 0 },
 };
+#ifndef ANDROID
 int hwaccel_lax_profile_check = 0;
 AVBufferRef *hw_device_ctx;
+#endif
 
 char *vstats_filename;
 char *sdp_filename;
@@ -1385,13 +1387,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
         if (*bsfs)
             bsfs++;
     }
-    if (ost->nb_bitstream_filters) {
-        ost->bsf_extradata_updated = av_mallocz_array(ost->nb_bitstream_filters, sizeof(*ost->bsf_extradata_updated));
-        if (!ost->bsf_extradata_updated) {
-            av_log(NULL, AV_LOG_FATAL, "Bitstream filter memory allocation failed\n");
-            exit_program(1);
-        }
-    }
 
     MATCH_PER_STREAM_OPT(codec_tags, str, codec_tag, oc, st);
     if (codec_tag) {