diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 15:30:16 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 15:30:16 +0200 |
| commit | 14762dd3f3bb8c38a47033ce054058bcf9d30b08 (patch) | |
| tree | 6ab11304206a846f384d58df50f41046c9d03779 /libavcodec | |
| parent | c01f1157acbec4274a38a728cf7fa9731ef23d82 (diff) | |
| parent | 015c2d923902fcd562571993eaf1231ce388c7f0 (diff) | |
| download | ffmpeg-14762dd3f3bb8c38a47033ce054058bcf9d30b08.tar.gz | |
Merge commit '015c2d923902fcd562571993eaf1231ce388c7f0'
* commit '015c2d923902fcd562571993eaf1231ce388c7f0':
libopencore-amr: Fix ff_dlog()/av_log() invocations
The log changed in our tree in 4a289624545c559107fac93597b23289a8b15c9f
is kept as is since it's the correct thing to do (the log mentions what
the first byte *was*, so it's refering to the source packet, not the
encoded bitstream).
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libopencore-amr.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index f0e34268f7..14d6ccc122 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> + #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" @@ -111,13 +113,13 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, void *data, packet_size = block_size[dec_mode] + 1; if (packet_size > buf_size) { - av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n", + av_log(avctx, AV_LOG_ERROR, "AMR frame too short (%d, should be %d)\n", buf_size, packet_size); return AVERROR_INVALIDDATA; } - ff_dlog(avctx, "packet_size=%d buf= 0x%X %X %X %X\n", - packet_size, buf[0], buf[1], buf[2], buf[3]); + ff_dlog(avctx, "packet_size=%d buf= 0x%"PRIx8" %"PRIx8" %"PRIx8" %"PRIx8"\n", + packet_size, buf[0], buf[1], buf[2], buf[3]); /* call decoder */ Decoder_Interface_Decode(s->dec_state, buf, (short *)frame->data[0], 0); @@ -339,7 +341,7 @@ static int amr_wb_decode_frame(AVCodecContext *avctx, void *data, packet_size = block_size[mode]; if (packet_size > buf_size) { - av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n", + av_log(avctx, AV_LOG_ERROR, "AMR frame too short (%d, should be %d)\n", buf_size, packet_size + 1); return AVERROR_INVALIDDATA; } |