avformat/dashenc: addition of muxer overhead in master playlist's bandwidth

[ffmpeg] / libavcodec / cbs_mpeg2_syntax_template.c

diff --git a/libavcodec/cbs_mpeg2_syntax_template.c b/libavcodec/cbs_mpeg2_syntax_template.c
index b61fc8bc24e653b277be83e8ca816f5f2d1b578e..51c32cb58d6ba15a48a24cc47427d7cfd65bcd35 100644 (file)
--- a/libavcodec/cbs_mpeg2_syntax_template.c
+++ b/libavcodec/cbs_mpeg2_syntax_template.c
@@ -1,18 +1,18 @@
 /*
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -67,7 +67,7 @@ static int FUNC(user_data)(CodedBitstreamContext *ctx, RWContext *rw,
     ui(8, user_data_start_code);
 
 #ifdef READ
-    k = bitstream_bits_left(rw);
+    k = get_bits_left(rw);
     av_assert0(k % 8 == 0);
     current->user_data_length = k /= 8;
     if (k > 0) {
@@ -353,11 +353,11 @@ static int FUNC(slice_header)(CodedBitstreamContext *ctx, RWContext *rw,
         {
             size_t k;
 #ifdef READ
-            BitstreamContext start;
+            GetBitContext start;
             uint8_t bit;
             start = *rw;
             for (k = 0; nextbits(1, 1, bit); k++)
-                bitstream_skip(rw, 8);
+                skip_bits(rw, 8);
             current->extra_information_length = k;
             if (k > 0) {
                 *rw = start;