* commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0': mpegtsenc: Take max_delay into account when buffering multiple audio packets into one PES packet Conflicts: libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>pull/130/head
commit
5b97681eaa
1 changed files with 4 additions and 1 deletions
Loading…
Reference in new issue