Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '12576afe206d35231ccd61f9033c5fdab6a11e80'

Browse Source 
* commit '12576afe206d35231ccd61f9033c5fdab6a11e80':
  adpcm: Write the correct number of samples for ima-dk4

Conflicts:
	libavcodec/adpcm.c

See: f18c873ab5

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/27/head
Michael Niedermayer 12 years ago
parent a3d9a21683 12576afe20
commit 067c9c3b63
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available