Merge commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Dec 2012 00:32:37 +0000 (01:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Dec 2012 00:32:37 +0000 (01:32 +0100)
* commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047':
  ac3dec: output planar float only
  svq3: make slice type value unsigned to match svq3_get_ue_golomb return type
  configure: Have protocols select network code instead of depending on it

Conflicts:
libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/ac3dec.c
libavcodec/ac3dec.h
libavcodec/svq3.c

diff --cc configure
+++ b/configure
@@@ -1949,54 -1725,28 +1947,55 @@@ rtmpt_protocol_select="ffrtmphttp_proto
  rtmpte_protocol_select="ffrtmpcrypt_protocol ffrtmphttp_protocol"
  rtmpts_protocol_select="ffrtmphttp_protocol https_protocol"
  rtp_protocol_select="udp_protocol"
- sctp_protocol_deps="network struct_sctp_event_subscribe"
- tcp_protocol_deps="network"
+ sctp_protocol_deps="struct_sctp_event_subscribe"
+ sctp_protocol_select="network"
+ tcp_protocol_select="network"
  tls_protocol_deps_any="openssl gnutls"
  tls_protocol_select="tcp_protocol"
- udp_protocol_deps="network"
+ udp_protocol_select="network"
  
  # filters
 +aconvert_filter_deps="swresample"
 +amovie_filter_deps="avcodec avformat"
 +aresample_filter_deps="swresample"
 +ass_filter_deps="libass"
 +asyncts_filter_deps="avresample"
 +atempo_filter_deps="avcodec rdft"
  blackframe_filter_deps="gpl"
  boxblur_filter_deps="gpl"
 +colormatrix_filter_deps="gpl"
  cropdetect_filter_deps="gpl"
 +decimate_filter_deps="gpl avcodec"
  delogo_filter_deps="gpl"
 +deshake_filter_deps="avcodec"
  drawtext_filter_deps="libfreetype"
 -frei0r_filter_deps="frei0r dlopen strtok_r"
 +ebur128_filter_deps="gpl"
 +flite_filter_deps="libflite"
 +frei0r_filter_deps="frei0r dlopen"
  frei0r_filter_extralibs='$ldl'
 -frei0r_src_filter_deps="frei0r dlopen strtok_r"
 +frei0r_src_filter_deps="frei0r dlopen"
  frei0r_src_filter_extralibs='$ldl'
 +geq_filter_deps="gpl"
  hqdn3d_filter_deps="gpl"
 +hue_filter_deps="gpl"
 +movie_filter_deps="avcodec avformat"
 +mp_filter_deps="gpl avcodec swscale postproc inline_asm"
 +mptestsrc_filter_deps="gpl"
 +negate_filter_deps="lut_filter"
  resample_filter_deps="avresample"
  ocv_filter_deps="libopencv"
 +pan_filter_deps="swresample"
 +removelogo_filter_deps="avcodec avformat swscale"
  scale_filter_deps="swscale"
 +smartblur_filter_deps="gpl swscale"
 +showspectrum_filter_deps="avcodec rdft"
 +subtitles_filter_deps="avformat avcodec libass"
 +super2xsai_filter_deps="gpl"
 +tinterlace_filter_deps="gpl"
  yadif_filter_deps="gpl"
 +pixfmts_super2xsai_test_deps="super2xsai_filter"
 +tinterlace_merge_test_deps="tinterlace_filter"
 +tinterlace_pad_test_deps="tinterlace_filter"
  
  # libraries
  avcodec_deps="avutil"
@@@ -2079,9 -1809,7 +2078,8 @@@ enable strippin
  enable asm
  enable debug
  enable doc
- enable network
  enable optimizations
 +enable runtime_cpudetect
  enable safe_bitstream_reader
  enable static
  enable swscale_alpha
@@@ -1395,19 -1376,10 +1384,12 @@@ static int ac3_decode_frame(AVCodecCont
              av_log(avctx, AV_LOG_ERROR, "error decoding the audio block\n");
              err = 1;
          }
-         if (avctx->sample_fmt == AV_SAMPLE_FMT_FLT) {
-             s->fmt_conv.float_interleave(out_samples_flt, output, 256,
-                                          s->out_channels);
-             out_samples_flt += 256 * s->out_channels;
-         } else {
-             s->fmt_conv.float_to_int16_interleave(out_samples_s16, output, 256,
-                                                   s->out_channels);
-             out_samples_s16 += 256 * s->out_channels;
-         }
+         for (ch = 0; ch < s->out_channels; ch++)
+             memcpy(s->frame.data[ch] + blk * 1024, output[ch], 1024);
      }
  
 +    s->frame.decode_error_flags = err ? FF_DECODE_ERROR_INVALID_BITSTREAM : 0;
 +
      *got_frame_ptr   = 1;
      *(AVFrame *)data = s->frame;
  
Simple merge
Simple merge