summaryrefslogtreecommitdiff
path: root/libavcodec/metasound.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-22 18:43:40 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-22 18:43:40 +0100
commit8d024c51071ded5e6d4fa500ee5f3c1ce4886d07 (patch)
tree1a10423704449a31e1fc8cd26f795ecb07b6f860 /libavcodec/metasound.c
parent7ef8d97b1aa9e142527debcaf993aa1ee8f08a9b (diff)
parentcc8163e1a3601a56f722a4720516e860bf1c6198 (diff)
downloadffmpeg-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/metasound.c')
-rw-r--r--libavcodec/metasound.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/metasound.c b/libavcodec/metasound.c
index 677e959d48..2dab135bda 100644
--- a/libavcodec/metasound.c
+++ b/libavcodec/metasound.c
@@ -21,6 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <inttypes.h>
#include <math.h>
#include <stdint.h>
@@ -283,7 +284,7 @@ static av_cold int metasound_decode_init(AVCodecContext *avctx)
for (;;) {
if (!props->tag) {
- av_log(avctx, AV_LOG_ERROR, "Could not find tag %08X\n", tag);
+ av_log(avctx, AV_LOG_ERROR, "Could not find tag %08"PRIX32"\n", tag);
return AVERROR_INVALIDDATA;
}
if (props->tag == tag) {