OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4d9c044
)
Rename remaining occurrences of SAMPLE_FMT_* to AV_SAMPLE_FMT_*
author
Anton Khirnov
<anton@khirnov.net>
Thu, 3 Feb 2011 13:34:01 +0000
(13:34 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 4 Feb 2011 02:10:12 +0000
(
03:10
+0100)
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
151595fe2e06969a83654564a15feb5b9e8aa2c4
)
libavcodec/amrwbdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/amrwbdec.c
b/libavcodec/amrwbdec.c
index
1735c29
..
90bf1d5
100644
(file)
--- 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},
};