[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Michael Niedermayer git at videolan.org
Wed Dec 25 12:47:25 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 25 12:39:16 2013 +0100| [2c0b246b5babc51ac9b7b21a2c88c32d01993efc] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  error.h: Do not circularly depend on avutil.h

See: 7c2bb79f3b849d12800856379063f99f3b018678
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c0b246b5babc51ac9b7b21a2c88c32d01993efc
---





More information about the ffmpeg-cvslog mailing list