virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

Merge commit 'd84429d41e24437536907af1e6b73197ecf3f6db'

Browse Source 
* commit 'd84429d41e24437536907af1e6b73197ecf3f6db':
  dnxhd: Print unknown header when found

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-05-13 22:10:54 +02:00
parent e5397513b9 d84429d41e
commit 53d2b69b72
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/dnxhddec.c
View File

@@ -129,7 +129,9 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
} }
if (memcmp(buf, header_prefix, 5) && memcmp(buf, header_prefix444, 5)) { if (memcmp(buf, header_prefix, 5) && memcmp(buf, header_prefix444, 5)) {
av_log(ctx->avctx, AV_LOG_ERROR, "error in header\n"); av_log(ctx->avctx, AV_LOG_ERROR,
"unknown header 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X\n",
buf[0], buf[1], buf[2], buf[3], buf[4]);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (buf[5] & 2) { /* interlaced */ if (buf[5] & 2) { /* interlaced */