gcc chokes on xmm constraints, so pessimize int32_to_float_fmul_scalar_sse a little

[ffmpeg] / libavcodec / dpcm.c

diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c
index b8fecf7d54051183725251ec5118a0e6f2da4579..ff684aeb432eab656e4242e1df08fc408542abf1 100644 (file)
--- a/libavcodec/dpcm.c
+++ b/libavcodec/dpcm.c
@@ -48,7 +48,7 @@ typedef struct DPCMContext {
 
 #define SE_16BIT(x)  if (x & 0x8000) x -= 0x10000;
 
-static int interplay_delta_table[] = {
+static const int interplay_delta_table[] = {
          0,      1,      2,      3,      4,      5,      6,      7,
          8,      9,     10,     11,     12,     13,     14,     15,
         16,     17,     18,     19,     20,     21,     22,     23,
@@ -154,6 +154,7 @@ static av_cold int dpcm_decode_init(AVCodecContext *avctx)
         break;
     }
 
+    avctx->sample_fmt = SAMPLE_FMT_S16;
     return 0;
 }
 
@@ -304,7 +305,7 @@ AVCodec name ## _decoder = {                    \
     NULL,                                       \
     NULL,                                       \
     dpcm_decode_frame,                          \
-    .long_name = long_name_,                    \
+    .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
 };
 
 DPCM_DECODER(CODEC_ID_INTERPLAY_DPCM, interplay_dpcm, "Interplay DPCM");