Merge commit '781d97fd54b1f0d8f4f7536dbd932dca6445476e'

Browse Source

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

...

This commit is contained in:

Michael Niedermayer

2014-03-24 15:45:47 +01:00

parent 15fe694e5c 781d97fd54

commit c31b3e3878

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available