[FFmpeg-cvslog] Merge commit 'a09c499a2e25ded575cb9f37528384402be86ad8'

Michael Niedermayer git at videolan.org
Wed Apr 29 17:00:13 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 29 16:49:04 2015 +0200| [50e46b7f0dca4d974f4c092f663bbbcf5f3d5e99] | committer: Michael Niedermayer

Merge commit 'a09c499a2e25ded575cb9f37528384402be86ad8'

* commit 'a09c499a2e25ded575cb9f37528384402be86ad8':
  rawenc: properly allocate coded_frame

Conflicts:
	libavcodec/rawenc.c

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

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





More information about the ffmpeg-cvslog mailing list