Merge commit 'ea6ab02a174bcc11f3eaa1b840c9a4c895968690'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 3 May 2016 09:24:27 +0000 (10:24 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 3 May 2016 09:24:33 +0000 (10:24 +0100)
commit8bba752ae95f385f2658c43ca5b512e5f9b31a51
tree267cd52bec7a65b966c35717e8b422efce17726d
parent014fb816d104fef876f7044c0f6876e890c93c0a
parentea6ab02a174bcc11f3eaa1b840c9a4c895968690
Merge commit 'ea6ab02a174bcc11f3eaa1b840c9a4c895968690'

* commit 'ea6ab02a174bcc11f3eaa1b840c9a4c895968690':
  svq3: move the frame num variables to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/svq3.c