Unified · Split
| @@ -337,8 +337,8 @@ FF_DISABLE_DEPRECATION_WARNINGS · 336 unmodified lines | ||
| 337 | 337 | mh.num_substreams > 1) { |
| 338 | 338 | avctx->channels = 2; |
| 339 | 339 | avctx->channel_layout = AV_CH_LAYOUT_STEREO; |
| 340 | − } else | |
| 341 | 340 | FF_ENABLE_DEPRECATION_WARNINGS |
| 341 | + } else | |
| 342 | 342 | #endif |
| 343 | 343 | if (avctx->request_channel_layout == AV_CH_LAYOUT_STEREO && |
| 344 | 344 | mh.num_substreams > 1) { |
| @@ -360,8 +360,8 @@ FF_DISABLE_DEPRECATION_WARNINGS · 15 unmodified lines | ||
| 360 | 360 | avctx->request_channels <= mh.channels_thd_stream1) { |
| 361 | 361 | avctx->channels = mh.channels_thd_stream1; |
| 362 | 362 | avctx->channel_layout = mh.channel_layout_thd_stream1; |
| 363 | − } else | |
| 364 | 363 | FF_ENABLE_DEPRECATION_WARNINGS |
| 364 | + } else | |
| 365 | 365 | #endif |
| 366 | 366 | if (avctx->request_channel_layout == AV_CH_LAYOUT_STEREO && |
| 367 | 367 | mh.num_substreams > 1) { |
| @@ -471,8 +471,8 @@ FF_DISABLE_DEPRECATION_WARNINGS · 470 unmodified lines | ||
| 471 | 471 | "Further substreams will be skipped.\n", |
| 472 | 472 | s->max_channel + 1, substr); |
| 473 | 473 | m->max_decoded_substream = substr; |
| 474 | − } else | |
| 475 | 474 | FF_ENABLE_DEPRECATION_WARNINGS |
| 475 | + } else | |
| 476 | 476 | #endif |
| 477 | 477 | if (m->avctx->request_channel_layout == s->ch_layout && |
| 478 | 478 | m->max_decoded_substream > substr) { |