Merge commit '601c2015bc16f0b281160292a6a760cbbbb0eacb'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 11:29:39 +0000 (13:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 11:29:39 +0000 (13:29 +0200)
commitc092af30088e42c2333ef0953f9dd2fdf76d3dee
treebad2d14019fd3868368abe3161a159c082fca0bb
parent61a8eaf7119db509cbfc0b8c123f5c6baad78a32
parent601c2015bc16f0b281160292a6a760cbbbb0eacb
Merge commit '601c2015bc16f0b281160292a6a760cbbbb0eacb'

* commit '601c2015bc16f0b281160292a6a760cbbbb0eacb':
  svq3: Avoid a division by zero

Conflicts:
libavcodec/svq3.c

See: 4fa706a4a64f9e06b08c1a42a62893ff2f7de82f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/svq3.c