ffmpeg | branch: release/2.4 | Michael Niedermayer <michae...@gmx.at> | Tue May
19 20:56:10 2015 +0200| [d45eef081469053c9487ef21254b03608f8f669d] | committer:
Michael Niedermayer
Merge commit '844201e35fe575710be8218d45828df49b77f205' into release/2.4
* commit '844201e35fe575710be8218d45828df49b77f205':
mpegts: Update the PSI/SI table only if the version change
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d45eef081469053c9487ef21254b03608f8f669d
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
