From 5d6e4c160a4a0d71c17e8428123027c747ff0fb3 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini
Date: Fri, 12 Nov 2010 11:04:40 +0000
Subject: Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and
 enum SampleFormat with AVSampleFormat.

Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/g726.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libavcodec/g726.c')

diff --git a/libavcodec/g726.c b/libavcodec/g726.c
index 4c63bf3895..52ebda6e49 100644
--- a/libavcodec/g726.c
+++ b/libavcodec/g726.c
@@ -332,7 +332,7 @@ static av_cold int g726_init(AVCodecContext * avctx)
     avctx->coded_frame->key_frame = 1;
 
     if (avctx->codec->decode)
-        avctx->sample_fmt = SAMPLE_FMT_S16;
+        avctx->sample_fmt = AV_SAMPLE_FMT_S16;
 
     /* select a frame size that will end on a byte boundary and have a size of
        approximately 1024 bytes */
@@ -401,7 +401,7 @@ AVCodec adpcm_g726_encoder = {
     g726_close,
     NULL,
     .capabilities = CODEC_CAP_SMALL_LAST_FRAME,
-    .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("G.726 ADPCM"),
 };
 #endif
-- 
cgit v1.2.3