eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-15 19:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
12f7253d0ea11c44ac01e1727a2724df060530a8
ffmpeg/libavformat/mpegts.c
Michael Niedermayer 12f7253d0e Merge commit '82de8d71118f4eafd6a43e9ea9169bd411793798' 
* commit '82de8d71118f4eafd6a43e9ea9169bd411793798':
  mpegts: Update the PSI/SI table only if the version change

Conflicts:
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29 04:24:06 +02:00

92 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink