git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
25cd5cb
)
Remove dead code.
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 16 Jun 2008 20:40:44 +0000
(20:40 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 16 Jun 2008 20:40:44 +0000
(20:40 +0000)
Originally committed as revision 13781 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/g726.c
patch
|
blob
|
history
diff --git
a/libavcodec/g726.c
b/libavcodec/g726.c
index
cb55a52
..
35be557
100644
(file)
--- a/
libavcodec/g726.c
+++ b/
libavcodec/g726.c
@@
-381,9
+381,6
@@
static int g726_decode_frame(AVCodecContext *avctx,
uint8_t mask;
GetBitContext gb;
- if (!buf_size)
- goto out;
-
mask = (1<<c->code_size) - 1;
init_get_bits(&gb, buf, buf_size * 8);
if (c->bits_left) {
@@
-398,7
+395,6
@@
static int g726_decode_frame(AVCodecContext *avctx,
c->bits_left = buf_size*8 - get_bits_count(&gb);
c->bit_buffer = get_bits(&gb, c->bits_left);
-out:
*data_size = (uint8_t*)samples - (uint8_t*)data;
return buf_size;
}