ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Sep 3
12:44:14 2014 +0200| [ee83f667afd276cbec15651948ed8477936b3631] | committer:
Michael Niedermayer
Merge commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74'
* commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74':
mpegts: Allow custom max resync size
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ee83f667afd276cbec15651948ed8477936b3631
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
