generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '5a4e9fe855282a99586050a507d0a486ad39df5b'

Browse Source 
* commit '5a4e9fe855282a99586050a507d0a486ad39df5b':
  avcodec/internal: Fix #if DECODE_AUDIO / ENCODE_AUDIO name mismatch
  shorten: use the unsigned type where needed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-06 23:56:07 +01:00
commit ff9b607489
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/internal.h
View File

@ -62,7 +62,7 @@ typedef struct AVCodecInternal {
*/ */
int is_copy; int is_copy;
#if FF_API_OLD_DECODE_AUDIO #if FF_API_OLD_ENCODE_AUDIO
/** /**
* Internal sample count used by avcodec_encode_audio() to fabricate pts. * Internal sample count used by avcodec_encode_audio() to fabricate pts.
* Can be removed along with avcodec_encode_audio(). * Can be removed along with avcodec_encode_audio().

17
libavcodec/shorten.c
View File

@ -87,7 +87,7 @@ typedef struct ShortenContext {
GetBitContext gb; GetBitContext gb;
int min_framesize, max_framesize; int min_framesize, max_framesize;
int channels; unsigned channels;
int32_t *decoded[MAX_CHANNELS]; int32_t *decoded[MAX_CHANNELS];
int32_t *decoded_base[MAX_CHANNELS]; int32_t *decoded_base[MAX_CHANNELS];
@ -338,7 +338,11 @@ static int read_header(ShortenContext *s)
s->internal_ftype = get_uint(s, TYPESIZE); s->internal_ftype = get_uint(s, TYPESIZE);
s->channels = get_uint(s, CHANSIZE); s->channels = get_uint(s, CHANSIZE);
if (s->channels <= 0 || s->channels > MAX_CHANNELS) { if (!s->channels) {
av_log(s->avctx, AV_LOG_ERROR, "No channels reported\n");
return AVERROR_INVALIDDATA;
}
if (s->channels > MAX_CHANNELS) {
av_log(s->avctx, AV_LOG_ERROR, "too many channels: %d\n", s->channels); av_log(s->avctx, AV_LOG_ERROR, "too many channels: %d\n", s->channels);
s->channels = 0; s->channels = 0;
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -347,10 +351,11 @@ static int read_header(ShortenContext *s)
/* get blocksize if version > 0 */ /* get blocksize if version > 0 */
if (s->version > 0) { if (s->version > 0) {
int skip_bytes, blocksize; int skip_bytes;
unsigned blocksize;
blocksize = get_uint(s, av_log2(DEFAULT_BLOCK_SIZE)); blocksize = get_uint(s, av_log2(DEFAULT_BLOCK_SIZE));
if (!blocksize || blocksize > (unsigned)MAX_BLOCKSIZE) { if (!blocksize || blocksize > MAX_BLOCKSIZE) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"invalid or unsupported block size: %d\n", "invalid or unsupported block size: %d\n",
blocksize); blocksize);
@ -500,13 +505,13 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data,
s->bitshift = get_ur_golomb_shorten(&s->gb, BITSHIFTSIZE); s->bitshift = get_ur_golomb_shorten(&s->gb, BITSHIFTSIZE);
break; break;
case FN_BLOCKSIZE: { case FN_BLOCKSIZE: {
int blocksize = get_uint(s, av_log2(s->blocksize)); unsigned blocksize = get_uint(s, av_log2(s->blocksize));
if (blocksize > s->blocksize) { if (blocksize > s->blocksize) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Increasing block size is not supported\n"); "Increasing block size is not supported\n");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
if (!blocksize || blocksize > (unsigned)MAX_BLOCKSIZE) { if (!blocksize || blocksize > MAX_BLOCKSIZE) {
av_log(avctx, AV_LOG_ERROR, "invalid or unsupported " av_log(avctx, AV_LOG_ERROR, "invalid or unsupported "
"block size: %d\n", blocksize); "block size: %d\n", blocksize);
return AVERROR(EINVAL); return AVERROR(EINVAL);