[FFmpeg-cvslog] Merge commit '781d97fd54b1f0d8f4f7536dbd932dca6445476e'
Michael Niedermayer
git at videolan.org
Mon Mar 24 15:47:02 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 15:45:47 2014 +0100| [c31b3e3878e64c4d0e126024d3e4f6e2b6916d98] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c31b3e3878e64c4d0e126024d3e4f6e2b6916d98
---
More information about the ffmpeg-cvslog
mailing list