avformat/aviobuf: End grace period of allowing 0 from read_packet

[ffmpeg] / libavformat / hlsplaylist.c

diff --git a/libavformat/hlsplaylist.c b/libavformat/hlsplaylist.c
index 43f9d281ba0ff0b5d293accc692a6596e3a674af..0e1dcc087f071d9e2f6ec7b9e8964f0d32e0e6f7 100644 (file)
--- a/libavformat/hlsplaylist.c
+++ b/libavformat/hlsplaylist.c
@@ -28,15 +28,18 @@
 #include "avformat.h"
 #include "hlsplaylist.h"
 
-void ff_hls_write_playlist_version(AVIOContext *out, int version) {
+void ff_hls_write_playlist_version(AVIOContext *out, int version)
+{
     if (!out)
         return;
     avio_printf(out, "#EXTM3U\n");
     avio_printf(out, "#EXT-X-VERSION:%d\n", version);
 }
 
-void ff_hls_write_audio_rendition(AVIOContext *out, char *agroup,
-                                  const char *filename, char *language, int name_id, int is_default) {
+void ff_hls_write_audio_rendition(AVIOContext *out, const char *agroup,
+                                  const char *filename, const char *language,
+                                  int name_id, int is_default)
+{
     if (!out || !agroup || !filename)
         return;
 
@@ -48,8 +51,10 @@ void ff_hls_write_audio_rendition(AVIOContext *out, char *agroup,
     avio_printf(out, "URI=\"%s\"\n", filename);
 }
 
-void ff_hls_write_subtitle_rendition(AVIOContext *out, char *sgroup,
-                                  const char *filename, char *language, int name_id, int is_default) {
+void ff_hls_write_subtitle_rendition(AVIOContext *out, const char *sgroup,
+                                     const char *filename, const char *language,
+                                     int name_id, int is_default)
+{
     if (!out || !filename)
         return;
 
@@ -61,10 +66,11 @@ void ff_hls_write_subtitle_rendition(AVIOContext *out, char *sgroup,
     avio_printf(out, "URI=\"%s\"\n", filename);
 }
 
-void ff_hls_write_stream_info(AVStream *st, AVIOContext *out,
-                              int bandwidth, const char *filename, char *agroup,
-                              char *codecs, char *ccgroup, char *sgroup) {
-
+void ff_hls_write_stream_info(AVStream *st, AVIOContext *out, int bandwidth,
+                              const char *filename, const char *agroup,
+                              const char *codecs, const char *ccgroup,
+                              const char *sgroup)
+{
     if (!out || !filename)
         return;
 
@@ -91,7 +97,8 @@ void ff_hls_write_stream_info(AVStream *st, AVIOContext *out,
 
 void ff_hls_write_playlist_header(AVIOContext *out, int version, int allowcache,
                                   int target_duration, int64_t sequence,
-                                  uint32_t playlist_type, int iframe_mode) {
+                                  uint32_t playlist_type, int iframe_mode)
+{
     if (!out)
         return;
     ff_hls_write_playlist_version(out, version);
@@ -112,8 +119,9 @@ void ff_hls_write_playlist_header(AVIOContext *out, int version, int allowcache,
     }
 }
 
-void ff_hls_write_init_file(AVIOContext *out, char *filename,
-                            int byterange_mode, int64_t size, int64_t pos) {
+void ff_hls_write_init_file(AVIOContext *out, const char *filename,
+                            int byterange_mode, int64_t size, int64_t pos)
+{
     avio_printf(out, "#EXT-X-MAP:URI=\"%s\"", filename);
     if (byterange_mode) {
         avio_printf(out, ",BYTERANGE=\"%"PRId64"@%"PRId64"\"", size, pos);
@@ -122,12 +130,14 @@ void ff_hls_write_init_file(AVIOContext *out, char *filename,
 }
 
 int ff_hls_write_file_entry(AVIOContext *out, int insert_discont,
-                             int byterange_mode,
-                             double duration, int round_duration,
-                             int64_t size, int64_t pos, //Used only if HLS_SINGLE_FILE flag is set
-                             char *baseurl, //Ignored if NULL
-                             char *filename, double *prog_date_time,
-                             int64_t video_keyframe_size, int64_t video_keyframe_pos, int iframe_mode) {
+                            int byterange_mode, double duration,
+                            int round_duration, int64_t size,
+                            int64_t pos /* Used only if HLS_SINGLE_FILE flag is set */,
+                            const char *baseurl /* Ignored if NULL */,
+                            const char *filename, double *prog_date_time,
+                            int64_t video_keyframe_size, int64_t video_keyframe_pos,
+                            int iframe_mode)
+{
     if (!out || !filename)
         return AVERROR(EINVAL);
 
@@ -176,7 +186,8 @@ int ff_hls_write_file_entry(AVIOContext *out, int insert_discont,
     return 0;
 }
 
-void ff_hls_write_end_list (AVIOContext *out) {
+void ff_hls_write_end_list(AVIOContext *out)
+{
     if (!out)
         return;
     avio_printf(out, "#EXT-X-ENDLIST\n");