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)
* commit 'b52307933b576eba741c80108c3dad09eb48ba12':
  wrapped_avframe: Drop a now-unused variable

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

Simple merge