ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Aug 21
21:56:33 2014 +0200| [fca76dc61ed650477c6e537b9db7c4ae2767197b] | committer:
Michael Niedermayer
Merge commit '13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9'
* commit '13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9':
adts: Return more meaningful error codes
Conflicts:
libavformat/adtsenc.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fca76dc61ed650477c6e537b9db7c4ae2767197b
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
