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:
0f5cc12
)
Remove unneeded wrapper function.
author
Justin Ruggles
<justin.ruggles@gmail.com>
Sat, 31 Jul 2010 16:50:27 +0000
(16:50 +0000)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Sat, 31 Jul 2010 16:50:27 +0000
(16:50 +0000)
Originally committed as revision 24622 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/flacenc.c
patch
|
blob
|
history
diff --git
a/libavcodec/flacenc.c
b/libavcodec/flacenc.c
index
487d023
..
afaa0c3
100644
(file)
--- a/
libavcodec/flacenc.c
+++ b/
libavcodec/flacenc.c
@@
-632,13
+632,6
@@
static uint32_t calc_rice_params_lpc(RiceContext *rc, int pmin, int pmax,
}
-static void encode_residual_verbatim(int32_t *res, int32_t *smp, int n)
-{
- assert(n > 0);
- memcpy(res, smp, n * sizeof(int32_t));
-}
-
-
static void encode_residual_fixed(int32_t *res, const int32_t *smp, int n,
int order)
{
@@
-824,7
+817,7
@@
static int encode_residual_ch(FlacEncodeContext *s, int ch)
/* VERBATIM */
if (frame->verbatim_only || n < 5) {
sub->type = sub->type_code = FLAC_SUBFRAME_VERBATIM;
-
encode_residual_verbatim(res, smp, n
);
+
memcpy(res, smp, n * sizeof(int32_t)
);
return sub->obits * n;
}