check validity of pointer srcC

[ffmpeg] / libavcodec / libgsm.c

diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c
index 01e58d7a62ade5da242a01e3da4ebe0015666844..e036afd3c4533dbf769b8cf770ab7449585025ee 100644 (file)
--- a/libavcodec/libgsm.c
+++ b/libavcodec/libgsm.c
@@ -21,7 +21,7 @@
  */
 
 /**
- * @file libgsm.c
+ * @file libavcodec/libgsm.c
  * Interface to libgsm for gsm encoding/decoding
  */
 
@@ -48,21 +48,23 @@ static av_cold int libgsm_init(AVCodecContext *avctx) {
 
         if(!avctx->sample_rate)
             avctx->sample_rate= 8000;
+
+        avctx->sample_fmt = SAMPLE_FMT_S16;
     }else{
-    if (avctx->sample_rate != 8000) {
-        av_log(avctx, AV_LOG_ERROR, "Sample rate 8000Hz required for GSM, got %dHz\n",
-               avctx->sample_rate);
-        if(avctx->strict_std_compliance > FF_COMPLIANCE_INOFFICIAL)
-        return -1;
-    }
-    if (avctx->bit_rate != 13000 /* Official */ &&
-        avctx->bit_rate != 13200 /* Very common */ &&
-        avctx->bit_rate != 0 /* Unknown; a.o. mov does not set bitrate when decoding */ ) {
-        av_log(avctx, AV_LOG_ERROR, "Bitrate 13000bps required for GSM, got %dbps\n",
-               avctx->bit_rate);
-        if(avctx->strict_std_compliance > FF_COMPLIANCE_INOFFICIAL)
-        return -1;
-    }
+        if (avctx->sample_rate != 8000) {
+            av_log(avctx, AV_LOG_ERROR, "Sample rate 8000Hz required for GSM, got %dHz\n",
+                avctx->sample_rate);
+            if(avctx->strict_std_compliance > FF_COMPLIANCE_INOFFICIAL)
+                return -1;
+        }
+        if (avctx->bit_rate != 13000 /* Official */ &&
+            avctx->bit_rate != 13200 /* Very common */ &&
+            avctx->bit_rate != 0 /* Unknown; a.o. mov does not set bitrate when decoding */ ) {
+            av_log(avctx, AV_LOG_ERROR, "Bitrate 13000bps required for GSM, got %dbps\n",
+                avctx->bit_rate);
+            if(avctx->strict_std_compliance > FF_COMPLIANCE_INOFFICIAL)
+                return -1;
+        }
     }
 
     avctx->priv_data = gsm_create();
@@ -87,6 +89,7 @@ static av_cold int libgsm_init(AVCodecContext *avctx) {
 }
 
 static av_cold int libgsm_close(AVCodecContext *avctx) {
+    av_freep(&avctx->coded_frame);
     gsm_destroy(avctx->priv_data);
     avctx->priv_data = NULL;
     return 0;
@@ -117,7 +120,8 @@ AVCodec libgsm_encoder = {
     libgsm_init,
     libgsm_encode_frame,
     libgsm_close,
-    .long_name = "libgsm GSM",
+    .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
+    .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
 };
 
 AVCodec libgsm_ms_encoder = {
@@ -128,7 +132,8 @@ AVCodec libgsm_ms_encoder = {
     libgsm_init,
     libgsm_encode_frame,
     libgsm_close,
-    .long_name = "libgsm GSM Microsoft variant",
+    .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
+    .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
 };
 
 static int libgsm_decode_frame(AVCodecContext *avctx,
@@ -158,7 +163,7 @@ AVCodec libgsm_decoder = {
     NULL,
     libgsm_close,
     libgsm_decode_frame,
-    .long_name = "libgsm GSM",
+    .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
 };
 
 AVCodec libgsm_ms_decoder = {
@@ -170,5 +175,5 @@ AVCodec libgsm_ms_decoder = {
     NULL,
     libgsm_close,
     libgsm_decode_frame,
-    .long_name = "libgsm GSM Microsoft variant",
+    .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
 };