[FFmpeg-cvslog] Merge commit 'c342132fa8a29692e28c98238e3a31da5c407e42'

Michael Niedermayer git at videolan.org
Mon Dec 9 18:06:46 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  9 17:59:33 2013 +0100| [3f5f955c5366de1f0dc643d9631b6cc19ba008cd] | committer: Michael Niedermayer

Merge commit 'c342132fa8a29692e28c98238e3a31da5c407e42'

* commit 'c342132fa8a29692e28c98238e3a31da5c407e42':
  frame: copy flags in av_frame_copy_props()

Conflicts:
	libavutil/frame.c

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

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





More information about the ffmpeg-cvslog mailing list