diff options
| author | Rodeo <[email protected]> | 2012-08-15 15:25:06 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2012-08-15 15:25:06 +0000 |
| commit | 6254327d7932b0a33a533453ac11f66e0915a123 (patch) | |
| tree | f71d611dcf3c81eee538c8b9753c8f5b0ef4edab /libhb | |
| parent | 0217b856e5dad739dc75874d9a0360c6b048a719 (diff) | |
declpcm: modify hdr2layout.
AV_CH_LAYOUT_STEREO w/7 or 8 channels is invalid anyway, and will get sanitized in hb_ff_layout_xlat(). Doing it in declpcm directly avoids an unnecessary call to that function, with identical results.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4905 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/declpcm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libhb/declpcm.c b/libhb/declpcm.c index a9e7e6e8f..8cc5c61b3 100644 --- a/libhb/declpcm.c +++ b/libhb/declpcm.c @@ -62,7 +62,7 @@ static const uint64_t hdr2layout[] = AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_2_1, AV_CH_LAYOUT_QUAD, AV_CH_LAYOUT_5POINT0_BACK, AV_CH_LAYOUT_6POINT0_FRONT, - AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_STEREO, + AV_CH_LAYOUT_6POINT1, AV_CH_LAYOUT_7POINT1, }; static void lpcmInfo( hb_work_object_t *w, hb_buffer_t *in ) @@ -382,8 +382,7 @@ static int declpcmBSInfo( hb_work_object_t *w, const hb_buffer_t *b, info->rate_base = 1; info->bitrate = bitrate; info->flags = ( b->data[3] << 16 ) | ( b->data[4] << 8 ) | b->data[5]; - info->channel_layout = hb_ff_layout_xlat(hdr2layout[nchannels - 1], - nchannels); + info->channel_layout = hdr2layout[nchannels - 1]; info->channel_map = &hb_libav_chan_map; info->samples_per_frame = ( duration * rate ) / 90000; |