diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-10 12:56:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-10 12:56:55 +0200 |
| commit | 067c9c3b6319de80cb165c20dc1da02f7e7c4b8a (patch) | |
| tree | 1dd810e48ad639145362750caabb68f8012ab09a /libavutil/version.h | |
| parent | a3d9a21683557d1e6c4c4018eb7979a9504fff0d (diff) | |
| parent | 12576afe206d35231ccd61f9033c5fdab6a11e80 (diff) | |
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>
Diffstat (limited to 'libavutil/version.h')
0 files changed, 0 insertions, 0 deletions