diff --git a/doc/APIchanges b/doc/APIchanges
index 5b91bb4b6e2879a3a15b7bfac2c4581686008199..1d0a3d295a46bf7ec88c750f19b9178345dd39ba 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -14,6 +14,9 @@ libavutil:     2015-08-28
 
 
 API changes, most recent first:
+2015-12-11 - xxxxxxx - lavf 57.20.100 - avformat.h
+  Add av_program_add_stream_index()
+
 2015-11-29 - xxxxxxx - lavc 57.16.101 - avcodec.h
   Deprecate rtp_callback without replacement, i.e. it won't be possible to
   get image slices before the full frame is encoded any more. The libavformat
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 36f9d029b99b4c83c13a7e05f0dde52db4bb0837..ddf07b1bf0321781910da1da70458a4828ffa1d5 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -2114,6 +2114,8 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options);
  */
 AVProgram *av_find_program_from_stream(AVFormatContext *ic, AVProgram *last, int s);
 
+void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);
+
 /**
  * Find the "best" stream in the file.
  * The best stream is determined according to various heuristics as the most
diff --git a/libavformat/hls.c b/libavformat/hls.c
index ccae270b265183f3148ebdb5f388b8881dc20544..2d4ee137ad4e00d30d72cd7c42dc58b90566be5a 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -1668,7 +1668,7 @@ static int hls_read_header(AVFormatContext *s)
             for (k = 0; k < pls->ctx->nb_streams; k++) {
                 struct AVStream *st = s->streams[pls->stream_offset + k];
 
-                ff_program_add_stream_index(s, i, pls->stream_offset + k);
+                av_program_add_stream_index(s, i, pls->stream_offset + k);
 
                 /* Set variant_bitrate for streams unique to this variant */
                 if (!is_shared && v->bandwidth)
diff --git a/libavformat/internal.h b/libavformat/internal.h
index 90f0a61433fb274a7cd38c04f9656f642a711d4e..4297cb85d74e02595887475e56ce115082abd0ac 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -156,8 +156,6 @@ char *ff_data_to_hex(char *buf, const uint8_t *src, int size, int lowercase);
  */
 int ff_hex_to_data(uint8_t *data, const char *p);
 
-void ff_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);
-
 /**
  * Add packet to AVFormatContext->packet_buffer list, determining its
  * interleaved position using compare() function argument.
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 4a6a5e5e85fad75c2f1ec264ac3af5858fffd33a..7a905a44e9bf8f660c6fa7bb79002adcc7a082a6 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -1958,7 +1958,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
 
         add_pid_to_pmt(ts, h->id, pid);
 
-        ff_program_add_stream_index(ts->stream, h->id, st->index);
+        av_program_add_stream_index(ts->stream, h->id, st->index);
 
         desc_list_len = get16(&p, p_end);
         if (desc_list_len < 0)
@@ -1975,7 +1975,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
 
             if (pes && prog_reg_desc == AV_RL32("HDMV") &&
                 stream_type == 0x83 && pes->sub_st) {
-                ff_program_add_stream_index(ts->stream, h->id,
+                av_program_add_stream_index(ts->stream, h->id,
                                             pes->sub_st->index);
                 pes->sub_st->codec->codec_tag = st->codec->codec_tag;
             }
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 1103a64e5de965471516888f0301d720eeba758d..2f864c682a6fb4c60dc056bd330fe21b1a30cf85 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3915,7 +3915,7 @@ AVChapter *avpriv_new_chapter(AVFormatContext *s, int id, AVRational time_base,
     return chapter;
 }
 
-void ff_program_add_stream_index(AVFormatContext *ac, int progid, unsigned idx)
+void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned idx)
 {
     int i, j;
     AVProgram *program = NULL;
diff --git a/libavformat/version.h b/libavformat/version.h
index 99ae17d8f3dde3da5e48aa465c7e44bae8e941a7..7a4e61cc0e23d30a0fea706daa817901e9847626 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -30,7 +30,7 @@
 #include "libavutil/version.h"
 
 #define LIBAVFORMAT_VERSION_MAJOR  57
-#define LIBAVFORMAT_VERSION_MINOR  19
+#define LIBAVFORMAT_VERSION_MINOR  20
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \