[FFmpeg-cvslog] Merge commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0'

Michael Niedermayer git at videolan.org
Wed May 1 10:31:21 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  1 10:24:45 2013 +0200| [0061ba044a44517d7291b80427cdebc5a1470c69] | committer: Michael Niedermayer

Merge commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0'

* commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0':
  vf_setpts: cosmetics, reformat

Conflicts:
	libavfilter/f_setpts.c

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

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





More information about the ffmpeg-cvslog mailing list