* commit 'ef363ebd':
  mp3enc: write full LAME frame

Conflicts:
	libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>