]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'f7c5883126f9440547933eefcf000aa78af4821c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Sep 2013 09:50:54 +0000 (11:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Sep 2013 09:58:00 +0000 (11:58 +0200)
* commit 'f7c5883126f9440547933eefcf000aa78af4821c':
  alac: Limit max_samples_per_frame

See: 3920d1387834e2bc334aff9f518f4beb24e470bd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/alac.c

Simple merge