aboutsummaryrefslogtreecommitdiffstats
path: root/libMpegTPEnc/src/tpenc_lib.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2015-01-05 21:25:10 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2015-01-05 21:25:10 +0100
commit7ce6f165752a23e38024d892c885245fc2f64d80 (patch)
treeb2359c7b2050cf7fcab473a7fcad053ab3a1c321 /libMpegTPEnc/src/tpenc_lib.cpp
parent599d0fc5892725e471772e567555bf075ad2ae86 (diff)
downloadfdk-aac-dabplus-enctest.tar.gz
fdk-aac-dabplus-enctest.tar.bz2
fdk-aac-dabplus-enctest.zip
Add enctest toolenctest
Diffstat (limited to 'libMpegTPEnc/src/tpenc_lib.cpp')
-rw-r--r--libMpegTPEnc/src/tpenc_lib.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libMpegTPEnc/src/tpenc_lib.cpp b/libMpegTPEnc/src/tpenc_lib.cpp
index 058b8d4..d678724 100644
--- a/libMpegTPEnc/src/tpenc_lib.cpp
+++ b/libMpegTPEnc/src/tpenc_lib.cpp
@@ -282,7 +282,8 @@ TRANSPORTENC_ERROR transportEnc_Init(
case TT_MP4_ADTS:
/* Sanity checks */
if ( ( hTpEnc->config.aot != AOT_AAC_LC)
- ||(hTpEnc->config.samplesPerFrame != 1024) )
+ || ((hTpEnc->config.samplesPerFrame != 1024) &&
+ (hTpEnc->config.samplesPerFrame != 960) ) )
{
return TRANSPORTENC_INVALID_PARAMETER;
}