← Back to branch summary

~ubuntu-branches/debian/experimental/libav/experimental

« back to all changes in this revision

Viewing changes to libavcodec/mlpdec.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2014-02-17 22:07:03 UTC
  • mfrom: (1.1.25)
  • Revision ID: package-import@ubuntu.com-20140217220703-51bpzx0ln1d961vs
Tags: 6:10~beta1-2
http://bugs.debian.org/738599
* New Upstream release 10_beta1. This upstream git snapshot has too many
  changes to list here, cf. to the upstream Changelog:
  http://git.libav.org/?p=libav.git;a=blob;f=Changelog;hb=refs/tags/v10_beta1
  - works with H.264 that has different bit depth between chroma and luma,
    Closes: #738599
* Bump shlibs

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/mlpdec.c
504
504
    } else
505
505
FF_ENABLE_DEPRECATION_WARNINGS
506
506
#endif
507
 
    if (m->avctx->request_channel_layout == s->ch_layout &&
508
 
        m->max_decoded_substream > substr) {
 
507
    if (m->avctx->request_channel_layout && (s->ch_layout & m->avctx->request_channel_layout) ==
 
508
        m->avctx->request_channel_layout && m->max_decoded_substream > substr) {
509
509
        av_log(m->avctx, AV_LOG_DEBUG,
510
510
               "Extracting %d-channel downmix (0x%"PRIx64") from substream %d. "
511
511
               "Further substreams will be skipped.\n",