Merge branch 'resample-drop-frame'
authorCarl Hetherington <cth@carlh.net>
Tue, 2 Oct 2012 15:14:29 +0000 (16:14 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 2 Oct 2012 15:14:29 +0000 (16:14 +0100)
commitc55d8bcda8f4da74bbc9489127354211cea8f2ff
treed81b7197b635c6a9bcf9889c3dc4e6b9bc45bde3
parent11c0aac8508ac1a54e63bdcb31a85c941a7fb546
parent0f154f43bd0c88d1615e455bd8a169826a08c086
Merge branch 'resample-drop-frame'
src/lib/decoder.cc
src/lib/j2k_wav_encoder.cc