OSDN Git Service

Merge commit '95a8a5aca60ce37d3abdf121a0285c2e317cf521'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 22:40:57 +0000 (23:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 22:41:27 +0000 (23:41 +0100)
commit27e79779821ed0cca312e1d38ac3b1d38999b6ef
tree9f1f490064d46954665728bdefbfbf1eb58d8a41
parente22e943ef90e5698df128ed245a530d4b97dc317
parent95a8a5aca60ce37d3abdf121a0285c2e317cf521
Merge commit '95a8a5aca60ce37d3abdf121a0285c2e317cf521'

* commit '95a8a5aca60ce37d3abdf121a0285c2e317cf521':
  lavc: call av_frame_unref() instead of avcodec_get_frame_defaults().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c