Merge commit '33275a0de05e9bc321f2537a2a67921fab81624f'

* commit '33275a0de05e9bc321f2537a2a67921fab81624f':
  ac3dec: change logging of skipped E-AC-3 substreams.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-05-08 23:06:55 +01:00
commit 13b77e09c7
1 changed files with 3 additions and 2 deletions

View File

@ -1445,8 +1445,9 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data,
/* skip frame if CRC is ok. otherwise use error concealment. */
/* TODO: add support for substreams and dependent frames */
if (s->frame_type == EAC3_FRAME_TYPE_DEPENDENT || s->substreamid) {
av_log(avctx, AV_LOG_WARNING, "unsupported frame type : "
"skipping frame\n");
av_log(avctx, AV_LOG_DEBUG,
"unsupported frame type %d: skipping frame\n",
s->frame_type);
*got_frame_ptr = 0;
return buf_size;
} else {