Merge commit 'a1e2caa93e4f8102666a21222f01b74838b6497f'

* commit 'a1e2caa93e4f8102666a21222f01b74838b6497f':
  mov: Log format rather than fourcc in stsd in trace mode

Conflicts:
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/mov.c
index 323dfe1af077d97f7d95c3fe8a261b0fc170c507,d075645bea9e5af24a071c0b40b1640602617cc8..6d598630a02916a090fa5c6601312c88cbd99cfd
--- 1/libavformat/mov.c
--- 2/libavformat/mov.c
+++ b/libavformat/mov.c
@@@ -1993,9 -1791,9 +1993,10 @@@ int ff_mov_read_stsd_entries(MOVContex
  
          id = mov_codec_id(st, format);
  
-         av_log(c->fc, AV_LOG_TRACE, "size=%"PRId64" 4CC= %c%c%c%c codec_type=%d\n", size,
+         av_log(c->fc, AV_LOG_TRACE,
 -               "size=%"PRIu32" format=0x%08x codec_type=%d\n",
 -               size, format, st->codec->codec_type);
++               "size=%"PRId64" 4CC= %c%c%c%c/0x%08x codec_type=%d\n", size,
 +                (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff,
-                 (format >> 24) & 0xff, st->codec->codec_type);
++                (format >> 24) & 0xff, format, st->codec->codec_type);
  
          if (st->codec->codec_type==AVMEDIA_TYPE_VIDEO) {
              st->codec->codec_id = id;