[FFmpeg-cvslog] Merge commit 'd6006dd9f0d4d01023359230212f1f9fa4800e5b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 20 22:05:27 2015 +0200| [96504b3f72a7fad602fbbb06d85633c52ceaf8da] | committer: Michael Niedermayer

Merge commit 'd6006dd9f0d4d01023359230212f1f9fa4800e5b'

* commit 'd6006dd9f0d4d01023359230212f1f9fa4800e5b':
  libvpxenc: Do not entangle coded_frame

Conflicts:
	libavcodec/libvpxenc.c

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

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