fix errors in previous avutil include logic

After the layout definitions were dropped from avcodec, audioconvert.h
was renamed to channel_layout.h in avutil 52.2.0.

This fix is necessary for the ffmpeg-1.0 branch, which has the
slimmed-down avcodec but not the avutil header renaming.