Merge commit '12576afe206d35231ccd61f9033c5fdab6a11e80'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jul 2013 10:56:10 +0000 (12:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jul 2013 10:56:55 +0000 (12:56 +0200)
commit067c9c3b6319de80cb165c20dc1da02f7e7c4b8a
tree1dd810e48ad639145362750caabb68f8012ab09a
parenta3d9a21683557d1e6c4c4018eb7979a9504fff0d
parent12576afe206d35231ccd61f9033c5fdab6a11e80
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>