motion_est: remove useless no_motion_search() function

[ffmpeg] / libavcodec / dcadec.c

diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index f488da6d3fe9d7f6fc1b60e0dac603e4e5386a23..6b0812cf7079803fc566790253d0ed2301d5ed49 100644 (file)
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -561,7 +561,7 @@ static int dca_parse_frame_header(DCAContext *s)
     if (s->frame_size < 95)
         return AVERROR_INVALIDDATA;
     s->amode             = get_bits(&s->gb, 6);
-    s->sample_rate       = ff_dca_sample_rates[get_bits(&s->gb, 4)];
+    s->sample_rate       = avpriv_dca_sample_rates[get_bits(&s->gb, 4)];
     if (!s->sample_rate)
         return AVERROR_INVALIDDATA;
     s->bit_rate_index    = get_bits(&s->gb, 5);
@@ -1957,7 +1957,7 @@ static const AVProfile profiles[] = {
 AVCodec ff_dca_decoder = {
     .name            = "dca",
     .type            = AVMEDIA_TYPE_AUDIO,
-    .id              = CODEC_ID_DTS,
+    .id              = AV_CODEC_ID_DTS,
     .priv_data_size  = sizeof(DCAContext),
     .init            = dca_decode_init,
     .decode          = dca_decode_frame,