On Thu, Jul 16, 2015 at 10:53:28PM +0200, Marton Balint wrote: > Hello Michael, > > Please merge from my stable branch for the following patches: > > 53f2ef2 mxfdec: calculate the index in display order > f384132 concatdec: add support for specifying inpoint of files > 1ea909a concatdec: store eof condition in context > 52bc064 concatdec: add support for specifying outpoint of files > bd5e11e concatdec: add support for injecting packet metadata > 7f6aef8 avformat: bump micro version after adding concatdec features > > The mxf patch was reviewed by Tomas, the other ones are approved by > Nicolas.
merged with a small typo fix [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Many that live deserve death. And some that die deserve life. Can you give it to them? Then do not be too eager to deal out death in judgement. For even the very wise cannot see all ends. -- Gandalf
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel