diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-08 01:05:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-08 01:05:28 +0200 |
| commit | 5d1b39f7e7381a2e837b9b6d43dede7de528da3c (patch) | |
| tree | 5d0f96c4324c637d436e1aaf2f45aee1eb9f99b6 /libavcodec/libgsm.c | |
| parent | ebd1edf36c81155e2817edaa056b0bc9eb21e8f5 (diff) | |
| parent | 2f138f0b7c36fe50b51e0d74bc913d14aea00c5e (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: clean up library installation rules
vf_drawtext: Remove some write-only variables.
libgsm: Drop const qualifier to silence compiler warning.
docs: Remove needless configure options
docs: Don't recommend adding --enable-memalign-hack
libvo-amrwbenc: Add braces to shut up gcc warning.
adts: Fix PCE copying.
Conflicts:
configure
doc/general.texi
subdir.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libgsm.c')
| -rw-r--r-- | libavcodec/libgsm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c index 1f76f82d55..45cb256fcf 100644 --- a/libavcodec/libgsm.c +++ b/libavcodec/libgsm.c @@ -139,7 +139,7 @@ AVCodec ff_libgsm_ms_encoder = { static int libgsm_decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { - const uint8_t *buf = avpkt->data; + uint8_t *buf = avpkt->data; int buf_size = avpkt->size; *data_size = 0; /* In case of error */ if(buf_size < avctx->block_align) return -1; |