af_join: Set the output frame format
af_channelmap: Set the frame channel layout

Otherwise the frame would show the first layout matching the
channel count.
Merge commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e'

* commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e':
  af_join: Set the output frame format

See: e0dd8cadcc386a168e7acd079463880154086446
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'f0e959481968b6d906931127237ed981b6414f6e'

* commit 'f0e959481968b6d906931127237ed981b6414f6e':
  af_channelmap: Set the frame channel layout

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/h264_parser: remove redundant assignment

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/hevc: move HEVCLocalContext declaration into loop

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>