mp4: Handle non-trivial ES Descriptors.

[ffmpeg] / libavformat / rtpenc_h264.c

diff --git a/libavformat/rtpenc_h264.c b/libavformat/rtpenc_h264.c
index f488386a79127fcebc243de2115f2ce934ce8050..9ca6f7f68ebc128616fae428e08f23ae6c4ef4f7 100644 (file)
--- a/libavformat/rtpenc_h264.c
+++ b/libavformat/rtpenc_h264.c
@@ -2,36 +2,36 @@
  * RTP packetization for H.264 (RFC3984)
  * Copyright (c) 2008 Luca Abeni
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav 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 FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
- * @file rtpenc_h264.c
+ * @file
  * @brief H.264 packetization
  * @author Luca Abeni <lucabe72@email.it>
  */
 
 #include "avformat.h"
 #include "avc.h"
-#include "rtp_h264.h"
+#include "rtpenc.h"
 
 static void nal_send(AVFormatContext *s1, const uint8_t *buf, int size, int last)
 {
-    RTPDemuxContext *s = s1->priv_data;
+    RTPMuxContext *s = s1->priv_data;
 
     av_log(s1, AV_LOG_DEBUG, "Sending NAL %x of len %d M=%d\n", buf[0] & 0x1F, size, last);
     if (size <= s->max_payload_size) {
@@ -56,14 +56,14 @@ static void nal_send(AVFormatContext *s1, const uint8_t *buf, int size, int last
         }
         s->buf[1] |= 1 << 6;
         memcpy(&s->buf[2], buf, size);
-        ff_rtp_send_data(s1, s->buf, size + 2, 1);
+        ff_rtp_send_data(s1, s->buf, size + 2, last);
     }
 }
 
 void ff_rtp_send_h264(AVFormatContext *s1, const uint8_t *buf1, int size)
 {
     const uint8_t *r;
-    RTPDemuxContext *s = s1->priv_data;
+    RTPMuxContext *s = s1->priv_data;
 
     s->timestamp = s->cur_timestamp;
     r = ff_avc_find_startcode(buf1, buf1 + size);