diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-19 01:36:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-19 01:47:10 +0100 |
| commit | 4a519b6e036bb593d868c2a424da43512215c571 (patch) | |
| tree | bbbd734383e7b2bfd005a1c19fe64d36d493b576 /libavcodec/mpc7.c | |
| parent | 57182b9f0fa15ebedbf5229e17bc77a70cc68d9d (diff) | |
| parent | 5be805d38cb43e6f0b85941f75946d09bc8cc13f (diff) | |
| download | ffmpeg-4a519b6e036bb593d868c2a424da43512215c571.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mov: Use defines for sample flags in fragments
mov: Use defines for trun flags
mov: Use defines for tfhd flags
proresenc: force bitrate not to exceed given limit
vc1parse: call vc1_init_common().
wma: don't return 0 on invalid packets.
asf: prevent packet_size_left from going negative if hdrlen > pktlen.
mjpegb: don't return 0 at the end of frame decoding.
rtpdec: Identify incorrectly signalled H263
vp8dsp: split long line.
aiff: don't skip block_align==0 check on COMM-after-SSND files.
dpcm: ignore extra unpaired bytes in stereo streams.
mp3on4: require a minimum framesize.
mpc7: assign an error level + context to av_log() msg.
huffyuv: error out on bit overrun.
dct-test: Add the missing ff_ prefix to the altivec functions
dct-test: Remove a stray declaration of a nonexistent function
movenc: Write the unknown duration as 64 bit fields in ismv
movenc: Write track durations with all bits set if duration is unknown
Conflicts:
libavcodec/dct-test.c
libavcodec/wmadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpc7.c')
| -rw-r--r-- | libavcodec/mpc7.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c index e90c934912..6e4b8501c5 100644 --- a/libavcodec/mpc7.c +++ b/libavcodec/mpc7.c @@ -298,7 +298,7 @@ static int mpc7_decode_frame(AVCodecContext * avctx, void *data, bits_used = get_bits_count(&gb); bits_avail = buf_size * 8; if (!last_frame && ((bits_avail < bits_used) || (bits_used + 32 <= bits_avail))) { - av_log(NULL,0, "Error decoding frame: used %i of %i bits\n", bits_used, bits_avail); + av_log(avctx, AV_LOG_ERROR, "Error decoding frame: used %i of %i bits\n", bits_used, bits_avail); return -1; } if(c->frames_to_skip){ |