[FFmpeg-cvslog] Merge commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162'

Michael Niedermayer git at videolan.org
Mon Jul 20 22:21:51 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 20 22:14:29 2015 +0200| [256430cf384d34c15a9ec579fbf48708502ab5f4] | committer: Michael Niedermayer

Merge commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162'

* commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162':
  qtrleenc: Keep coded_frame.key_frame a write-only variable

Conflicts:
	libavcodec/qtrleenc.c

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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





More information about the ffmpeg-cvslog mailing list