xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-02-15 01:17:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '304089aca7d238ae184e09993b5c737aa22e2c2c'

Browse Source 
* commit '304089aca7d238ae184e09993b5c737aa22e2c2c':
  mxf: Add UID print helpers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-17 21:49:27 +02:00
commit ecb7f1dd52
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/mxf.h
View File

@ -79,6 +79,18 @@ extern const MXFCodecUL ff_mxf_pixel_format_uls[];
int ff_mxf_decode_pixel_layout(const char pixel_layout[16], enum AVPixelFormat *pix_fmt);
const MXFSamplesPerFrame *ff_mxf_get_samples_per_frame(AVFormatContext *s, AVRational time_base);
#define PRIxUID \
"%02x.%02x.%02x.%02x." \
"%02x.%02x.%02x.%02x." \
"%02x.%02x.%02x.%02x." \
"%02x.%02x.%02x.%02x"
#define UID_ARG(x) \
(x)[0], (x)[1], (x)[2], (x)[3], \
(x)[4], (x)[5], (x)[6], (x)[7], \
(x)[8], (x)[9], (x)[10], (x)[11], \
(x)[12], (x)[13], (x)[14], (x)[15] \
#ifdef DEBUG
#define PRINT_KEY(pc, s, x) \
av_log(pc, AV_LOG_VERBOSE, \

3
libavformat/mxfdec.c
View File

@ -2210,6 +2210,9 @@ static int mxf_read_header(AVFormatContext *s)
return res;
}
break;
} else {
av_log(s, AV_LOG_VERBOSE, "Dark key " PRIxUID "\n",
UID_ARG(klv.key));
}
}
if (!metadata->read)