* commit 'c9281a01':
  lavf: drop the zero-sized packets hack

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