diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-03 20:53:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-03 21:01:40 +0200 |
| commit | 5b97681eaa5aed5103519deed4a706b89a910746 (patch) | |
| tree | 689fdc631098d338a622a78d8638a541149780f8 /libswscale/x86/Makefile | |
| parent | 44cae912522d579a15c39a00ef2b91dc9c42f881 (diff) | |
| parent | 7d097a0fc57f0fa8385962a539c657c2f40b5ed0 (diff) | |
| download | ffmpeg-5b97681eaa5aed5103519deed4a706b89a910746.tar.gz | |
Merge commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0'
* 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>
Diffstat (limited to 'libswscale/x86/Makefile')
0 files changed, 0 insertions, 0 deletions