Merge commit 'f457edb69794c7e13b3630456d72f7942fff19f7'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 07:53:52 +0000 (09:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 07:53:57 +0000 (09:53 +0200)
* commit 'f457edb69794c7e13b3630456d72f7942fff19f7':
  aacdec: Use avpriv_report_missing_feature() instead of custom logging.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aacdec.c

index 63a7fd1..6b1933d 100644 (file)
@@ -793,9 +793,9 @@ static int decode_ga_specific_config(AACContext *ac, AVCodecContext *avctx,
         case AOT_ER_AAC_LD:
             res_flags = get_bits(gb, 3);
             if (res_flags) {
-                av_log(avctx, AV_LOG_ERROR,
-                       "AAC data resilience not supported (flags %x)\n",
-                       res_flags);
+                avpriv_report_missing_feature(avctx, AV_LOG_ERROR,
+                                              "AAC data resilience (flags %x)",
+                                              res_flags);
                 return AVERROR_PATCHWELCOME;
             }
             break;
@@ -809,9 +809,8 @@ static int decode_ga_specific_config(AACContext *ac, AVCodecContext *avctx,
     case AOT_ER_AAC_LD:
         ep_config = get_bits(gb, 2);
         if (ep_config) {
-            av_log(avctx, AV_LOG_ERROR,
-                   "epConfig %d is not supported.\n",
-                   ep_config);
+            avpriv_report_missing_feature(avctx, AV_LOG_ERROR,
+                                          "epConfig %d", ep_config);
             return AVERROR_PATCHWELCOME;
         }
     }
@@ -877,10 +876,10 @@ static int decode_audio_specific_config(AACContext *ac,
             return ret;
         break;
     default:
-        av_log(avctx, AV_LOG_ERROR,
-               "Audio object type %s%d is not supported.\n",
-               m4ac->sbr == 1 ? "SBR+" : "",
-               m4ac->object_type);
+        avpriv_report_missing_feature(avctx, AV_LOG_ERROR,
+                                      "Audio object type %s%d",
+                                      m4ac->sbr == 1 ? "SBR+" : "",
+                                      m4ac->object_type);
         return AVERROR(ENOSYS);
     }