diff options
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavformat/avformat.h | 2 | ||||
| -rw-r--r-- | libavformat/hls.c | 2 | ||||
| -rw-r--r-- | libavformat/internal.h | 2 | ||||
| -rw-r--r-- | libavformat/mpegts.c | 4 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
7 files changed, 10 insertions, 7 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 5b91bb4b6e..1d0a3d295a 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 36f9d029b9..ddf07b1bf0 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 ccae270b26..2d4ee137ad 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 90f0a61433..4297cb85d7 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 4a6a5e5e85..7a905a44e9 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 1103a64e5d..2f864c682a 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 99ae17d8f3..7a4e61cc0e 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, \ |