[FFmpeg-cvslog] Merge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 11 23:49:44 2013 +0100| [5a15bd6f2f40253dbc5d4add783d29cbe673aa97] | committer: Michael Niedermayer

Merge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4'

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

Conflicts:
	ffplay.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a15bd6f2f40253dbc5d4add783d29cbe673aa97
---