ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Oct 10
20:34:14 2014 +0200| [fc6aa304596bba3837e1026fe1fb6abba1295ab5] | committer:
Michael Niedermayer
Merge commit 'eb4f9069002e73648f6640cd054fc814cfda75b8'
* commit 'eb4f9069002e73648f6640cd054fc814cfda75b8':
lavf: More informative error message
Conflicts:
libavformat/mux.c
See: 30ced7e69f434bd49b39fb7c8ce02d9ba71babfc
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc6aa304596bba3837e1026fe1fb6abba1295ab5
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
