Merge commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Dec 2014 21:53:23 +0000 (22:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Dec 2014 21:54:49 +0000 (22:54 +0100)
commit829099545bf32c28236f8caa5558b81d25efcf91
treec0ec7ce6076e8ecf338c1c67d738deac2aee55f9
parent27f2e211aa6d0f9b5b4e4c04d3a3567423085d49
parentfd665f7f48fa7db89eb9a93ac33919f6adc40f9d
Merge commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d'

* commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d':
  avconv: Use the mpeg12 private option scan_offset

Conflicts:
ffmpeg_opt.c

See: e479013ae41050ad9b76429d8c6ab70684cddc93
Merged-by: Michael Niedermayer <michaelni@gmx.at>