diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 15:45:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 15:45:47 +0100 |
| commit | c31b3e3878e64c4d0e126024d3e4f6e2b6916d98 (patch) | |
| tree | 02afe639baac5afd4c8abd5aeef73d1c6ac0bc23 /doc/doxy-wrapper.sh | |
| parent | 15fe694e5ca13e217a643553fbd8e15b5fc865de (diff) | |
| parent | 781d97fd54b1f0d8f4f7536dbd932dca6445476e (diff) | |
| download | ffmpeg-c31b3e3878e64c4d0e126024d3e4f6e2b6916d98.tar.gz | |
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>
Diffstat (limited to 'doc/doxy-wrapper.sh')
0 files changed, 0 insertions, 0 deletions