Merge branch 'deltecent-mp4'

This commit is contained in:
Fred Gleason 2018-10-16 19:56:43 -04:00
commit 581ec455cf
2 changed files with 10 additions and 7 deletions

View File

@ -17792,3 +17792,6 @@
2018-10-16 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdservice(8) that caused maintenance routines
to be attempted only once per invocation.
2018-10-16 Patrick Linstruth <patrick@deltecent.com>
* Fixed a bug that caused the build to break when M4A decoding
support was enabled.

View File

@ -30,6 +30,13 @@
#include <errno.h>
#include <unistd.h>
#include <rdapplication.h>
#include <rdaudioconvert.h>
#include <rdcart.h>
#include <rdconf.h>
#include <rd.h>
#include <rdtempdirectory.h>
#include <sndfile.h>
#include <samplerate.h>
#include <soundtouch/SoundTouch.h>
@ -48,13 +55,6 @@
#include <id3/tag.h>
#include <qfile.h>
#include <rdapplication.h>
#include <rdaudioconvert.h>
#include <rdcart.h>
#include <rdconf.h>
#include <rd.h>
#include <rdtempdirectory.h>
#define STAGE2_XFER_SIZE 2048
#define STAGE2_BUFFER_SIZE 49152