Merge commit '781d97fd54b1f0d8f4f7536dbd932dca6445476e'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 14:45:47 +0000 (15:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 14:45:47 +0000 (15:45 +0100)
commitc31b3e3878e64c4d0e126024d3e4f6e2b6916d98
tree02afe639baac5afd4c8abd5aeef73d1c6ac0bc23
parent15fe694e5ca13e217a643553fbd8e15b5fc865de
parent781d97fd54b1f0d8f4f7536dbd932dca6445476e
Merge commit '781d97fd54b1f0d8f4f7536dbd932dca6445476e'

* commit '781d97fd54b1f0d8f4f7536dbd932dca6445476e':
  avconv: remove unused nb_frames_dup

Conflicts:
ffmpeg.c

No change, as the variable is not unused

Merged-by: Michael Niedermayer <michaelni@gmx.at>