ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed Oct 22
00:09:00 2014 +0200| [dd3f1563d7666b631035644ea690c20b00ec91de] | committer:
Michael Niedermayer
Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba'
* commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba':
nutenc: check for negative index rather than assert
Conflicts:
libavformat/nutenc.c
Not merged, the assert is correct
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dd3f1563d7666b631035644ea690c20b00ec91de
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
