[FFmpeg-cvslog] Merge commit 'f7c5883126f9440547933eefcf000aa78af4821c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep  4 11:50:54 2013 +0200| [642207d29a4861900cf34f19e8c7ded23ace6075] | committer: Michael Niedermayer

Merge commit 'f7c5883126f9440547933eefcf000aa78af4821c'

* commit 'f7c5883126f9440547933eefcf000aa78af4821c':
  alac: Limit max_samples_per_frame

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

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