Merge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 22:49:44 +0000 (23:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 22:49:44 +0000 (23:49 +0100)
commit5a15bd6f2f40253dbc5d4add783d29cbe673aa97
treea8ce86aae36d45058f5db88b77d267c50e9121be
parent27e79779821ed0cca312e1d38ac3b1d38999b6ef
parent84f131921ffb43d8070d5680e91f6a24d66ccac4
Merge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4'

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

Conflicts:
ffplay.c

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