diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 04:15:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 04:15:27 +0200 |
| commit | 55a04a5d7a90a2eddcfe1fe407c403ba95b281b8 (patch) | |
| tree | bcd8be47748d8f15f79d32ff47060ed521aa5534 /libavformat/mov.c | |
| parent | 35c8dda5c2dbeb37c659f964372edf6f2bde3b5f (diff) | |
| parent | a1e2caa93e4f8102666a21222f01b74838b6497f (diff) | |
| download | ffmpeg-streaming-55a04a5d7a90a2eddcfe1fe407c403ba95b281b8.zip ffmpeg-streaming-55a04a5d7a90a2eddcfe1fe407c403ba95b281b8.tar.gz | |
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>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 323dfe1..6d59863 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1993,9 +1993,10 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) 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=%"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; |
