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)
* 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>

Trivial merge