[FFmpeg-cvslog] Merge commit '53abe32409f13687c864b3cda077a1aa906a2459'
Michael Niedermayer
git at videolan.org
Sun Jul 27 02:09:09 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 27 01:57:34 2014 +0200| [0a7f3af27fa29f2eb9cab0de22703d9c26d12b2c] | committer: Michael Niedermayer
Merge commit '53abe32409f13687c864b3cda077a1aa906a2459'
* commit '53abe32409f13687c864b3cda077a1aa906a2459':
avcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as const
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a7f3af27fa29f2eb9cab0de22703d9c26d12b2c
---
More information about the ffmpeg-cvslog
mailing list