avconv changes

Re-adding avconv changes.  Things got slightly off-track.