latm: Fix a double negation in a warning message

Message ID 1344498069-69517-1-git-send-email-martin@martin.st
State New
Headers show

Commit Message

Martin Storsjö Aug. 9, 2012, 7:41 a.m.
Also wrap the line while touching it.
---
 libavformat/latmenc.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Luca Barbato Aug. 9, 2012, 7:58 a.m. | #1
On 08/09/2012 09:41 AM, Martin Storsjö wrote:
> Also wrap the line while touching it.
> ---
>  libavformat/latmenc.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c
> index a161faa..061feb9 100644
> --- a/libavformat/latmenc.c
> +++ b/libavformat/latmenc.c
> @@ -137,7 +137,8 @@ static int latm_write_packet(AVFormatContext *s, AVPacket *pkt)
>      uint8_t *buf;
>  
>      if (pkt->size > 2 && pkt->data[0] == 0xff && (pkt->data[1] >> 4) == 0xf) {
> -        av_log(s, AV_LOG_ERROR, "ADTS header detected - ADTS will not be incorrectly muxed into LATM\n");
> +        av_log(s, AV_LOG_ERROR, "ADTS header detected - ADTS will not be "
> +                                "correctly muxed into LATM\n");
>          return AVERROR_INVALIDDATA;
>      }
>  
> 

Ok.
Kieran Kunhya Aug. 9, 2012, 11:21 a.m. | #2
The way I wrote it is correct. I'm not 100% sure how to explain it but
the adverb "incorrectly" refers to the muxing. i.e, before:
ADTS is not allowed in LATM and we will not be muxing it. The updated
version states: ADTS is allowed in LATM but we will not be muxing it.
Mans Rullgard Aug. 9, 2012, 11:25 a.m. | #3
Kieran Kunhya <kierank@ob-encoder.com> writes:

> The way I wrote it is correct. I'm not 100% sure how to explain it but
> the adverb "incorrectly" refers to the muxing. i.e, before:
> ADTS is not allowed in LATM and we will not be muxing it. The updated
> version states: ADTS is allowed in LATM but we will not be muxing it.

How about "ADTS detected, refusing to create invalid mux" or something
like that?

Patch

diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c
index a161faa..061feb9 100644
--- a/libavformat/latmenc.c
+++ b/libavformat/latmenc.c
@@ -137,7 +137,8 @@  static int latm_write_packet(AVFormatContext *s, AVPacket *pkt)
     uint8_t *buf;
 
     if (pkt->size > 2 && pkt->data[0] == 0xff && (pkt->data[1] >> 4) == 0xf) {
-        av_log(s, AV_LOG_ERROR, "ADTS header detected - ADTS will not be incorrectly muxed into LATM\n");
+        av_log(s, AV_LOG_ERROR, "ADTS header detected - ADTS will not be "
+                                "correctly muxed into LATM\n");
         return AVERROR_INVALIDDATA;
     }