From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 10 Jul 2013 10:56:10 +0000 (+0200)
Subject: Merge commit '12576afe206d35231ccd61f9033c5fdab6a11e80'
X-Git-Tag: n2.1~2126
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/067c9c3b6319de80cb165c20dc1da02f7e7c4b8a

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@gmx.at>
---

067c9c3b6319de80cb165c20dc1da02f7e7c4b8a