Merge commit 'b52307933b576eba741c80108c3dad09eb48ba12'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 16 Oct 2015 21:04:46 +0000 (23:04 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 16 Oct 2015 21:04:46 +0000 (23:04 +0200)
commitaf065bf11b61e3a1c4e3d0e9709584e8b24d9136
tree1d106de2ed4392c9705313f70054306bc17806d9
parenteebea62671b64e317bfd1a0670287e7d1b85fb04
parentb52307933b576eba741c80108c3dad09eb48ba12
Merge commit 'b52307933b576eba741c80108c3dad09eb48ba12'

* commit 'b52307933b576eba741c80108c3dad09eb48ba12':
  wrapped_avframe: Drop a now-unused variable

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/wrapped_avframe.c