rmdec: add missing brackets to compound statement

[ffmpeg] / libavformat / rtpdec_h263_rfc2190.c

diff --git a/libavformat/rtpdec_h263_rfc2190.c b/libavformat/rtpdec_h263_rfc2190.c
index f0794c7c94c25f7f671f17e190edde3c0c9d0145..5744d71da0fe6aa4f01790490d0490e028faf1d0 100644 (file)
--- a/libavformat/rtpdec_h263_rfc2190.c
+++ b/libavformat/rtpdec_h263_rfc2190.c
@@ -30,7 +30,8 @@
 #include "rtpdec_formats.h"
 #include "libavutil/attributes.h"
 #include "libavutil/intreadwrite.h"
-#include "libavcodec/get_bits.h"
+
+#include "libavcodec/bitstream.h"
 
 struct PayloadContext {
     AVIOContext *buf;
@@ -40,7 +41,7 @@ struct PayloadContext {
     int          newformat;
 };
 
-static void h263_free_context(PayloadContext *data)
+static void h263_close_context(PayloadContext *data)
 {
     ffio_free_dyn_buf(&data->buf);
 }
@@ -107,7 +108,7 @@ static int h263_handle_packet(AVFormatContext *ctx, PayloadContext *data,
             /* Invalid src for this format, and bits that should be zero
              * according to RFC 2190 aren't zero. */
             av_log(ctx, AV_LOG_WARNING,
-                   "Interpreting H263 RTP data as RFC 2429/4629 even though "
+                   "Interpreting H.263 RTP data as RFC 2429/4629 even though "
                    "signalled with a static payload type.\n");
             data->newformat = 1;
             return ff_h263_handle_packet(ctx, data, st, pkt, timestamp, buf,
@@ -141,18 +142,18 @@ static int h263_handle_packet(AVFormatContext *ctx, PayloadContext *data,
             avio_w8(data->buf, data->endbyte);
         } else {
             /* Start/end skip bits not matching - missed packets? */
-            GetBitContext gb;
-            init_get_bits(&gb, buf, len*8 - ebit);
-            skip_bits(&gb, sbit);
+            BitstreamContext bc;
+            bitstream_init(&bc, buf, len * 8 - ebit);
+            bitstream_skip(&bc, sbit);
             if (data->endbyte_bits) {
-                data->endbyte |= get_bits(&gb, 8 - data->endbyte_bits);
+                data->endbyte |= bitstream_read(&bc, 8 - data->endbyte_bits);
                 avio_w8(data->buf, data->endbyte);
             }
-            while (get_bits_left(&gb) >= 8)
-                avio_w8(data->buf, get_bits(&gb, 8));
-            data->endbyte_bits = get_bits_left(&gb);
+            while (bitstream_bits_left(&bc) >= 8)
+                avio_w8(data->buf, bitstream_read(&bc, 8));
+            data->endbyte_bits = bitstream_bits_left(&bc);
             if (data->endbyte_bits)
-                data->endbyte = get_bits(&gb, data->endbyte_bits) <<
+                data->endbyte = bitstream_read(&bc, data->endbyte_bits) <<
                                 (8 - data->endbyte_bits);
             ebit = 0;
             len = 0;
@@ -189,6 +190,6 @@ RTPDynamicProtocolHandler ff_h263_rfc2190_dynamic_handler = {
     .need_parsing      = AVSTREAM_PARSE_FULL,
     .parse_packet      = h263_handle_packet,
     .priv_data_size    = sizeof(PayloadContext),
-    .free              = h263_free_context,
+    .close             = h263_close_context,
     .static_payload_id = 34,
 };