* commit '84f13192':
  avplay: do not call avcodec_get_frame_defaults().

Conflicts:
	ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>