← Back to branch summary

~ubuntu-branches/ubuntu/hardy/ffmpeg/hardy

« back to all changes in this revision

Viewing changes to libavcodec/cook.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2006-08-23 14:35:52 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20060823143552-8fxnur5b9gesr03m
Tags: 3:0.cvs20060823-0ubuntu1
* Sync with Debian:
  + Add the epoch again

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/cook.c
1253
1253
    if (init_cook_vlc_tables(q) != 0)
1254
1254
        return -1;
1255
1255
 
 
1256
 
 
1257
    if(avctx->block_align >= UINT_MAX/2)
 
1258
        return -1;
 
1259
 
1256
1260
    /* Pad the databuffer with FF_INPUT_BUFFER_PADDING_SIZE,
1257
1261
       this is for the bitstreamreader. */
1258
1262
    if ((q->decoded_bytes_buffer = av_mallocz((avctx->block_align+(4-avctx->block_align%4) + FF_INPUT_BUFFER_PADDING_SIZE)*sizeof(uint8_t)))  == NULL)