* commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3': isom: Simplify mov_rewrite_dvd_sub_extradata() Conflicts: libavformat/isom.c See: f6f3c85c0e Merged-by: Michael Niedermayer <michaelni@gmx.at>
f6f3c85c0e