rtsp: make ff_sdp_parse return value forwarded

[ffmpeg] / libavformat / gif.c

diff --git a/libavformat/gif.c b/libavformat/gif.c
index 7ac949957749260ed8dd5c0933523a86b524c8eb..2388f9ba69f91a0cca99a1d069bf0fe0868a6bdb 100644 (file)
--- a/libavformat/gif.c
+++ b/libavformat/gif.c
@@ -232,9 +232,9 @@ static int gif_image_write_image(ByteIOContext *pb,
             put_bits(&p, 9, 0x101); /* end of stream */
             flush_put_bits(&p);
         }
-        if(pbBufPtr(&p) - p.buf > 0) {
-            put_byte(pb, pbBufPtr(&p) - p.buf); /* byte count of the packet */
-            put_buffer(pb, p.buf, pbBufPtr(&p) - p.buf); /* the actual buffer */
+        if(put_bits_ptr(&p) - p.buf > 0) {
+            put_byte(pb, put_bits_ptr(&p) - p.buf); /* byte count of the packet */
+            put_buffer(pb, p.buf, put_bits_ptr(&p) - p.buf); /* the actual buffer */
             p.buf_ptr = p.buf; /* dequeue the bytes off the bitstream */
         }
         left-=GIF_CHUNKS;
@@ -266,7 +266,7 @@ static int gif_write_header(AVFormatContext *s)
     video_enc = NULL;
     for(i=0;i<s->nb_streams;i++) {
         enc = s->streams[i]->codec;
-        if (enc->codec_type != CODEC_TYPE_AUDIO)
+        if (enc->codec_type != AVMEDIA_TYPE_AUDIO)
             video_enc = enc;
     }
 
@@ -329,7 +329,7 @@ static int gif_write_video(AVFormatContext *s,
 static int gif_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
     AVCodecContext *codec = s->streams[pkt->stream_index]->codec;
-    if (codec->codec_type == CODEC_TYPE_AUDIO)
+    if (codec->codec_type == AVMEDIA_TYPE_AUDIO)
         return 0; /* just ignore audio */
     else
         return gif_write_video(s, codec, pkt->data, pkt->size);
@@ -344,7 +344,7 @@ static int gif_write_trailer(AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat gif_muxer = {
+AVOutputFormat ff_gif_muxer = {
     "gif",
     NULL_IF_CONFIG_SMALL("GIF Animation"),
     "image/gif",