[FFmpeg-cvslog] Rename remaining occurrences of SAMPLE_FMT_* to AV_SAMPLE_FMT_*

Anton Khirnov git
Fri Feb 4 03:37:02 CET 2011


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Feb  3 13:34:01 2011 +0000| [7cb5258483961c6be50975ab40087e51b4b0fa9f] | committer: Michael Niedermayer

Rename remaining occurrences of SAMPLE_FMT_* to AV_SAMPLE_FMT_*

Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit 151595fe2e06969a83654564a15feb5b9e8aa2c4)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7cb5258483961c6be50975ab40087e51b4b0fa9f
---

 libavcodec/amrwbdec.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c
index 1735c29..90bf1d5 100644
--- a/libavcodec/amrwbdec.c
+++ b/libavcodec/amrwbdec.c
@@ -89,7 +89,7 @@ static av_cold int amrwb_decode_init(AVCodecContext *avctx)
     AMRWBContext *ctx = avctx->priv_data;
     int i;
 
-    avctx->sample_fmt = SAMPLE_FMT_FLT;
+    avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
 
     av_lfg_init(&ctx->prng, 1);
 
@@ -1233,5 +1233,5 @@ AVCodec ff_amrwb_decoder = {
     .init           = amrwb_decode_init,
     .decode         = amrwb_decode_frame,
     .long_name      = NULL_IF_CONFIG_SMALL("Adaptive Multi-Rate WideBand"),
-    .sample_fmts    = (enum AVSampleFormat[]){SAMPLE_FMT_FLT,SAMPLE_FMT_NONE},
+    .sample_fmts    = (enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE},
 };




More information about the ffmpeg-cvslog mailing list