lavc: Drop deprecated request_channels related functions

Deprecated in 04/2011.

Vittorio Giovara committed 11 years ago

Commit dc70c191 parent f6974fe8 files · +0 −81Browse files

Showing the changes to libavcodec/aac_ac3_parser.c (1 of 8 files). Show all

Unified · Split

libavcodec/aac_ac3_parser.c+0−8

@@ -84,14 +84,6 @@ get_next: · 83 unmodified lines
84	avctx->sample_rate = s->sample_rate;	84	avctx->sample_rate = s->sample_rate;
85		85
86	/* (E-)AC-3: allow downmixing to stereo or mono */	86	/* (E-)AC-3: allow downmixing to stereo or mono */
87	#if FF_API_REQUEST_CHANNELS
88	FF_DISABLE_DEPRECATION_WARNINGS
89	if (avctx->request_channels == 1)
90	avctx->request_channel_layout = AV_CH_LAYOUT_MONO;
91	else if (avctx->request_channels == 2)
92	avctx->request_channel_layout = AV_CH_LAYOUT_STEREO;
93	FF_ENABLE_DEPRECATION_WARNINGS
94	#endif
95	if (s->channels > 1 &&	87	if (s->channels > 1 &&
96	avctx->request_channel_layout == AV_CH_LAYOUT_MONO) {	88	avctx->request_channel_layout == AV_CH_LAYOUT_MONO) {
97	avctx->channels = 1;	89	avctx->channels = 1;