Merge remote branch 'qatar/master'

[ffmpeg] / libavcodec / roqaudioenc.c

diff --git a/libavcodec/roqaudioenc.c b/libavcodec/roqaudioenc.c
index 050c6571dd2f54e1c1565a32595a7d40f8398a5e..f6bd726c4ff7fc50552f6885857e56c0830afc86 100644 (file)
--- a/libavcodec/roqaudioenc.c
+++ b/libavcodec/roqaudioenc.c
@@ -49,7 +49,7 @@ static av_cold int roq_dpcm_encode_init(AVCodecContext *avctx)
         av_log(avctx, AV_LOG_ERROR, "Audio must be 22050 Hz\n");
         return -1;
     }
-    if (avctx->sample_fmt != SAMPLE_FMT_S16) {
+    if (avctx->sample_fmt != AV_SAMPLE_FMT_S16) {
         av_log(avctx, AV_LOG_ERROR, "Audio must be signed 16-bit\n");
         return -1;
     }
@@ -153,7 +153,7 @@ static av_cold int roq_dpcm_encode_close(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec roq_dpcm_encoder = {
+AVCodec ff_roq_dpcm_encoder = {
     "roq_dpcm",
     AVMEDIA_TYPE_AUDIO,
     CODEC_ID_ROQ_DPCM,
@@ -162,6 +162,6 @@ AVCodec roq_dpcm_encoder = {
     roq_dpcm_encode_frame,
     roq_dpcm_encode_close,
     NULL,
-    .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
+    .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
     .long_name = NULL_IF_CONFIG_SMALL("id RoQ DPCM"),
 };