← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libav/utopic-proposed

« back to all changes in this revision

Viewing changes to libavcodec/tscc2.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler, Reinhard Tartler, Rico Tzschichholz
  • Date: 2014-08-30 11:02:45 UTC
  • mfrom: (1.3.47 sid)
  • Revision ID: package-import@ubuntu.com-20140830110245-io3dg7q85wfr7125
Tags: 6:11~beta1-2
[ Reinhard Tartler ]
* Make libavcodec-dev depend on libavresample-dev

[ Rico Tzschichholz ]
* Some fixes and leftovers from soname bumps

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/tscc2.c
24
24
 * TechSmith Screen Codec 2 decoder
25
25
 */
26
26
 
 
27
#include <inttypes.h>
 
28
 
27
29
#define BITSTREAM_READER_LE
28
30
#include "avcodec.h"
29
31
#include "get_bits.h"
226
228
    bytestream2_init(&gb, buf, buf_size);
227
229
    frame_type = bytestream2_get_byte(&gb);
228
230
    if (frame_type > 1) {
229
 
        av_log(avctx, AV_LOG_ERROR, "Incorrect frame type %d\n", frame_type);
 
231
        av_log(avctx, AV_LOG_ERROR, "Incorrect frame type %"PRIu32"\n",
 
232
               frame_type);
230
233
        return AVERROR_INVALIDDATA;
231
234
    }
232
235
 
309
312
            }
310
313
        }
311
314
        if (bytestream2_get_bytes_left(&gb) < size) {
312
 
            av_log(avctx, AV_LOG_ERROR, "Invalid slice size (%d/%d)\n",
 
315
            av_log(avctx, AV_LOG_ERROR, "Invalid slice size (%"PRIu32"/%u)\n",
313
316
                   size, bytestream2_get_bytes_left(&gb));
314
317
            return AVERROR_INVALIDDATA;
315
318
        }