[FFmpeg-cvslog] r15762 - in trunk/libavcodec: audioconvert.c audioconvert.h avcodec.h utils.c

[Benjamin Larsson]

And we are back to this mess:

http://article.gmane.org/gmane.comp.video.ffmpeg.devel/48400

I think we should use the convention to map a bitmask with side or back
speakers to a 5.1 layout. So for example the ac3 encoder would then map

CHANNEL_LAYOUT_STEREO|CHANNEL_FRONT_CENTER|CHANNEL_BACK_LEFT|CHANNEL_BACK_RIGHT
CHANNEL_LAYOUT_STEREO|CHANNEL_FRONT_CENTER|CHANNEL_SIDE_LEFT|CHANNEL_SIDE_RIGHT

to it's native 5.1 mode. We still need to map this to only one
configuration when finally writing it to a container/codec that uses the
actual mask (right now wav/asf/avi).

The change needed is an addition of a convenience macro and an addition
to the channel_layout_map[] table.

MvH
Benjamin Larsson