Merge commit 'c6a1ac2dd9808a4753dd005ab5747dda68ab454f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Aug 2014 17:06:39 +0000 (19:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Aug 2014 17:12:14 +0000 (19:12 +0200)
commite896a5bdd6c3c5c132810231088daf4e58fbf6c7
tree123561fb0cb5a0bef187aacb565a0c730d89a7f3
parent2212bff9a2761c7786b27a9b8e3b42659d7e346e
parentc6a1ac2dd9808a4753dd005ab5747dda68ab454f
Merge commit 'c6a1ac2dd9808a4753dd005ab5747dda68ab454f'

* commit 'c6a1ac2dd9808a4753dd005ab5747dda68ab454f':
  vf_fps: Replace use of deprecated AVFilterBufferRef by AVFrame

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