[FFmpeg-cvslog] Revert "Fix channel layout for some stereo flac files."

[Carl Eugen Hoyos]

Michael Niedermayer <michaelni <at> gmx.at> writes:

> > After checking the spec more carefully, it seems my memory tricked me: 
> > FLAC and Vorbis really have the same channels up to 6 channels, only 
> > not in the same order, but the order does not appear in channel_layout.
> > 
> > I would really like to know why this had to be reverted.
> 
> i think carl told me to revert it but maybe i misunderstood him, it
> was more git commands than words

I committed 2ef249 to fix flac channel layout. I don't remember if there 
was a user report, it is more likely that I tested different codecs / 
container channel layouts at the time. A user reported a flac sample 
that worked fine with FFmpeg (since several months) together with my 
patch five weeks ago to the fork's bugzilla (209).
Justin (or the foundation?) decided to fix the bug differently, since 
Michael (very understandably) prefers not to have different code to 
maintain (and my "fix" may not have been complete, see the subsequent 
stereo commit), he merged 62d5f9 and my commit had to be reverted.
(Sorry, I thought this was clear for everybody.)

My only concern was that I thought my original commit was at least 
not completely wrong, that is why I asked Nicolas for clarification.

Carl Eugen