[FFmpeg-cvslog] Merge commit '12576afe206d35231ccd61f9033c5fdab6a11e80'

Michael Niedermayer git at videolan.org
Wed Jul 10 13:08:11 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 10 12:56:10 2013 +0200| [067c9c3b6319de80cb165c20dc1da02f7e7c4b8a] | committer: Michael Niedermayer

Merge commit '12576afe206d35231ccd61f9033c5fdab6a11e80'

* commit '12576afe206d35231ccd61f9033c5fdab6a11e80':
  adpcm: Write the correct number of samples for ima-dk4

Conflicts:
	libavcodec/adpcm.c

See: f18c873ab5ee3c78d00fdcc2582b39c133faecb4

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

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





More information about the ffmpeg-cvslog mailing list