Merge commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Aug 2013 08:44:55 +0000 (10:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Aug 2013 08:44:55 +0000 (10:44 +0200)
commit1dee467d262d5b376fa506a0da5325b12ceea51a
treeb927d6242382ebf5591937f211a7cb7431cf260e
parent86fe16a763abf2d44a9d3c2ed6d19324239731e4
parentfeaaf5f7f0afac7223457f871af2ec9b99eb6cc6
Merge commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6'

* commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6':
  nuv: Reset the frame on resize

Conflicts:
libavcodec/nuv.c

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