]> git.sesse.net Git - ffmpeg/commit
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Mar 2014 14:03:24 +0000 (15:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Mar 2014 14:04:56 +0000 (15:04 +0100)
commitb8f5b0713e812ce4ed699eb240a025c88d9ed2c2
treeb88611ca67e1ebb7525db65eccd50c9f9e9be5e1
parentd840266633c6c56e5abe42cfda997f22678fe7b1
parent6adf3bc42e36242d487636786e995149bbb849fe
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Add dvd subtitle support

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.c