ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun Aug 10 
02:01:34 2014 +0200| [329832d779e2c9f2a2aa97c90b6e3eb1aadb8ee8] | committer: 
Michael Niedermayer

Merge commit '24c788f4878729a42150581d7ed7e9a11daf874d'

* commit '24c788f4878729a42150581d7ed7e9a11daf874d':
  Remove obsolete FF_API_REFERENCE_DTS cruft.

Conflicts:
        libavformat/avformat.h

Merged-by: Michael Niedermayer <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to