Re: [FFmpeg-devel] [PATCH] avcodec: drop 2 suffix from avpriv_ac3_parse_header2

[Andreas Cadhalpun]

On 21.10.2015 01:46, Michael Niedermayer wrote:
> On Wed, Oct 21, 2015 at 12:36:59AM +0200, Andreas Cadhalpun wrote:
>> avpriv_ac3_parse_header was removed in commit 3dfb643.
>>
>> Signed-off-by: Andreas Cadhalpun 
>> ---
>>  libavcodec/ac3_parser.c | 4 ++--
>>  libavcodec/ac3_parser.h | 2 +-
>>  libavcodec/ac3dec.c | 2 +-
>>  libavformat/ac3dec.c| 2 +-
>>  libavformat/movenc.c| 4 ++--
>>  5 files changed, 7 insertions(+), 7 deletions(-)
> 
> LGTM

Pushed.

Best regards,
Andreas

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] avcodec: drop 2 suffix from avpriv_ac3_parse_header2

[Andreas Cadhalpun]

avpriv_ac3_parse_header was removed in commit 3dfb643.

Signed-off-by: Andreas Cadhalpun 
---
 libavcodec/ac3_parser.c | 4 ++--
 libavcodec/ac3_parser.h | 2 +-
 libavcodec/ac3dec.c | 2 +-
 libavformat/ac3dec.c| 2 +-
 libavformat/movenc.c| 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c
index 0dd98b9..83dd90f 100644
--- a/libavcodec/ac3_parser.c
+++ b/libavcodec/ac3_parser.c
@@ -47,7 +47,7 @@ static const uint8_t center_levels[4] = { 4, 5, 6, 5 };
 static const uint8_t surround_levels[4] = { 4, 6, 7, 6 };
 
 
-int avpriv_ac3_parse_header2(GetBitContext *gbc, AC3HeaderInfo **phdr)
+int avpriv_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo **phdr)
 {
 int frame_size_code;
 AC3HeaderInfo *hdr;
@@ -163,7 +163,7 @@ static int ac3_sync(uint64_t state, AACAC3ParseContext 
*hdr_info,
 GetBitContext gbc;
 
 init_get_bits(, tmp.u8+8-AC3_HEADER_SIZE, 54);
-err = avpriv_ac3_parse_header2(, );
+err = avpriv_ac3_parse_header(, );
 
 if(err < 0)
 return 0;
diff --git a/libavcodec/ac3_parser.h b/libavcodec/ac3_parser.h
index 80bc5ef..dc5d035 100644
--- a/libavcodec/ac3_parser.h
+++ b/libavcodec/ac3_parser.h
@@ -37,6 +37,6 @@
  * -2 if the bsid (version) element is invalid, -3 if the fscod (sample rate)
  * element is invalid, or -4 if the frmsizecod (bit rate) element is invalid.
  */
-int avpriv_ac3_parse_header2(GetBitContext *gbc, AC3HeaderInfo **hdr);
+int avpriv_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo **hdr);
 
 #endif /* AVCODEC_AC3_PARSER_H */
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 6df697e..ad91405 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -298,7 +298,7 @@ static int parse_frame_header(AC3DecodeContext *s)
 AC3HeaderInfo hdr, *phdr=
 int err;
 
-err = avpriv_ac3_parse_header2(>gbc, );
+err = avpriv_ac3_parse_header(>gbc, );
 if (err)
 return err;
 
diff --git a/libavformat/ac3dec.c b/libavformat/ac3dec.c
index bef55cb..363a32e 100644
--- a/libavformat/ac3dec.c
+++ b/libavformat/ac3dec.c
@@ -55,7 +55,7 @@ static int ac3_eac3_probe(AVProbeData *p, enum AVCodecID 
expected_codec_id)
 init_get_bits(, buf3, 54);
 }else
 init_get_bits(, buf2, 54);
-if(avpriv_ac3_parse_header2(, ) < 0)
+if(avpriv_ac3_parse_header(, ) < 0)
 break;
 if(buf2 + phdr->frame_size > end)
 break;
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 5115585..05198b4 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -341,7 +341,7 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, 
MOVTrack *track)
 info = track->eac3_priv;
 
 init_get_bits(, pkt->data, pkt->size * 8);
-if (avpriv_ac3_parse_header2(, ) < 0) {
+if (avpriv_ac3_parse_header(, ) < 0) {
 /* drop the packets until we see a good one */
 if (!track->entry) {
 av_log(mov, AV_LOG_WARNING, "Dropping invalid packet from start of 
the stream\n");
@@ -391,7 +391,7 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, 
MOVTrack *track)
 while (cumul_size != pkt->size) {
 int i;
 init_get_bits(, pkt->data + cumul_size, (pkt->size - 
cumul_size) * 8);
-if (avpriv_ac3_parse_header2(, ) < 0)
+if (avpriv_ac3_parse_header(, ) < 0)
 return AVERROR_INVALIDDATA;
 if (hdr->frame_type != EAC3_FRAME_TYPE_DEPENDENT)
 return AVERROR(EINVAL);
-- 
2.6.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] avcodec: drop 2 suffix from avpriv_ac3_parse_header2

[Michael Niedermayer]

On Wed, Oct 21, 2015 at 12:36:59AM +0200, Andreas Cadhalpun wrote:
> avpriv_ac3_parse_header was removed in commit 3dfb643.
> 
> Signed-off-by: Andreas Cadhalpun 
> ---
>  libavcodec/ac3_parser.c | 4 ++--
>  libavcodec/ac3_parser.h | 2 +-
>  libavcodec/ac3dec.c | 2 +-
>  libavformat/ac3dec.c| 2 +-
>  libavformat/movenc.c| 4 ++--
>  5 files changed, 7 insertions(+), 7 deletions(-)

LGTM

thx

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Complexity theory is the science of finding the exact solution to an
approximation. Benchmarking OTOH is finding an approximation of the exact


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel