Merge commit 'b74b88f30da2389f333a31815d8326d5576d3331'

* commit 'b74b88f30da2389f333a31815d8326d5576d3331':
  g723_1: Handle values at the ends of the table in lsp2lpc()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --git a/libavcodec/g723_1_data.h b/libavcodec/g723_1_data.h
index db7f6e4..41ec341 100644 (file)
--- a/libavcodec/g723_1_data.h
+++ b/libavcodec/g723_1_data.h
@@ -125,10 +125,8 @@ static const int16_t dc_lsp[LPC_ORDER] = {
     0x6c46
 };
 
-/**
- * Cosine table scaled by 2^14
- */
-static const int16_t cos_tab[COS_TBL_SIZE+1] = {
+/* Cosine table scaled by 2^14 */
+static const int16_t cos_tab[COS_TBL_SIZE + 1] = {
     16384,  16383,  16379,  16373,  16364,  16353,  16340,  16324,
     16305,  16284,  16261,  16235,  16207,  16176,  16143,  16107,
     16069,  16029,  15986,  15941,  15893,  15843,  15791,  15736,