[FFmpeg-cvslog] latmenc: simplify using avpriv_copy_bits.

Reimar Döffinger git at videolan.org
Thu Apr 12 20:32:49 CEST 2012


ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Tue Apr 10 21:42:17 2012 +0200| [9540476ba101874f7366e22ac24cdbde23d95968] | committer: Reimar Döffinger

latmenc: simplify using avpriv_copy_bits.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9540476ba101874f7366e22ac24cdbde23d95968
---

 libavformat/latmenc.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c
index 2d804ff..1722eb5 100644
--- a/libavformat/latmenc.c
+++ b/libavformat/latmenc.c
@@ -168,7 +168,7 @@ static int latm_write_packet(AVFormatContext *s, AVPacket *pkt)
 
     /* The LATM payload is written unaligned */
 
-    i = 0;
+    /* PayloadMux() */
     if (pkt->size && (pkt->data[0] & 0xe1) == 0x81) {
         // Convert byte-aligned DSE to non-aligned.
         // Due to the input format encoding we know that
@@ -179,11 +179,9 @@ static int latm_write_packet(AVFormatContext *s, AVPacket *pkt)
         // This allows us to remux our FATE AAC samples into latm
         // files that are still playable with minimal effort.
         put_bits(&bs, 8, pkt->data[0] & 0xfe);
-        i++;
-    }
-    /* PayloadMux() */
-    for (; i < pkt->size; i++)
-        put_bits(&bs, 8, pkt->data[i]);
+        avpriv_copy_bits(&bs, pkt->data + 1, 8*pkt->size - 8);
+    } else
+        avpriv_copy_bits(&bs, pkt->data, 8*pkt->size);
 
     avpriv_align_put_bits(&bs);
     flush_put_bits(&bs);



More information about the ffmpeg-cvslog mailing list