Merge commit '864c0c50eb0e7a112b20007459b0cb94b61cb8d3' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Dec 2014 12:43:45 +0000 (13:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Dec 2014 12:44:00 +0000 (13:44 +0100)
commit5ceae49caf088040c9bac45b5758390baea41c34
tree688644aa2ef6afd617b582885db0b43fe19f82ae
parent89dbef73296645b849371fa916b5656442406801
parent864c0c50eb0e7a112b20007459b0cb94b61cb8d3
Merge commit '864c0c50eb0e7a112b20007459b0cb94b61cb8d3' into release/2.4

* commit '864c0c50eb0e7a112b20007459b0cb94b61cb8d3':
  avconv: Use the mpeg12 private option scan_offset

Conflicts:
ffmpeg_opt.c

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