diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 18:43:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 18:43:40 +0100 |
| commit | 8d024c51071ded5e6d4fa500ee5f3c1ce4886d07 (patch) | |
| tree | 1a10423704449a31e1fc8cd26f795ecb07b6f860 /libavcodec/dfa.c | |
| parent | 7ef8d97b1aa9e142527debcaf993aa1ee8f08a9b (diff) | |
| parent | cc8163e1a3601a56f722a4720516e860bf1c6198 (diff) | |
| download | ffmpeg-8d024c51071ded5e6d4fa500ee5f3c1ce4886d07.tar.gz | |
Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'
* commit 'cc8163e1a3601a56f722a4720516e860bf1c6198':
avcodec: more correct printf specifiers
Conflicts:
libavcodec/4xm.c
libavcodec/alsdec.c
libavcodec/dfa.c
libavcodec/h264_ps.c
libavcodec/jpeg2000dec.c
libavcodec/lagarith.c
libavcodec/mpeg12dec.c
libavcodec/rv10.c
libavcodec/svq3.c
libavcodec/wmaprodec.c
libavcodec/xwddec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dfa.c')
| -rw-r--r-- | libavcodec/dfa.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c index b1be475ef2..f13291ef28 100644 --- a/libavcodec/dfa.c +++ b/libavcodec/dfa.c @@ -20,11 +20,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avassert.h" +#include <inttypes.h> + #include "avcodec.h" #include "bytestream.h" #include "internal.h" +#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/mem.h" @@ -369,7 +371,8 @@ static int dfa_decode_frame(AVCodecContext *avctx, return AVERROR_INVALIDDATA; } } else { - av_log(avctx, AV_LOG_WARNING, "Ignoring unknown chunk type %d\n", + av_log(avctx, AV_LOG_WARNING, + "Ignoring unknown chunk type %"PRIu32"\n", chunk_type); } buf += chunk_size; |