[FFmpeg-cvslog] Merge commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29'

Michael Niedermayer git at videolan.org
Tue Dec 18 14:41:54 CET 2012

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec 18 14:38:10 2012 +0100| [09b4ae8331f8c073792583d1eddf96973f709c89] | committer: Michael Niedermayer

Merge commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29'

* commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29':
  h264: prevent decoding of slice NALs in extradata
  doxy: Clarify what avpriv_set_pts_info does


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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09b4ae8331f8c073792583d1eddf96973f709c89

More information about the ffmpeg-cvslog mailing list