virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat: Add av_program_add_stream_index()

Browse Source 
This will be used by the subsequent commit(s)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-12-10 20:59:40 +01:00
parent 5f55be7005
commit 676a93f2d8
7 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -14,6 +14,9 @@ libavutil: 2015-08-28
API changes, most recent first: 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 2015-11-29 - xxxxxxx - lavc 57.16.101 - avcodec.h
Deprecate rtp_callback without replacement, i.e. it won't be possible to 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 get image slices before the full frame is encoded any more. The libavformat

2
libavformat/avformat.h
View File

@ -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); 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. * Find the "best" stream in the file.
* The best stream is determined according to various heuristics as the most * The best stream is determined according to various heuristics as the most

2
libavformat/hls.c
View File

@ -1668,7 +1668,7 @@ static int hls_read_header(AVFormatContext *s)
for (k = 0; k < pls->ctx->nb_streams; k++) { for (k = 0; k < pls->ctx->nb_streams; k++) {
struct AVStream *st = s->streams[pls->stream_offset + 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 */ /* Set variant_bitrate for streams unique to this variant */
if (!is_shared && v->bandwidth) if (!is_shared && v->bandwidth)

2
libavformat/internal.h
View File

@ -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); 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 * Add packet to AVFormatContext->packet_buffer list, determining its
* interleaved position using compare() function argument. * interleaved position using compare() function argument.

4
libavformat/mpegts.c
View File

@ -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); 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); desc_list_len = get16(&p, p_end);
if (desc_list_len < 0) 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") && if (pes && prog_reg_desc == AV_RL32("HDMV") &&
stream_type == 0x83 && pes->sub_st) { 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->index);
pes->sub_st->codec->codec_tag = st->codec->codec_tag; pes->sub_st->codec->codec_tag = st->codec->codec_tag;
} }

2
libavformat/utils.c
View File

@ -3915,7 +3915,7 @@ AVChapter *avpriv_new_chapter(AVFormatContext *s, int id, AVRational time_base,
return chapter; 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; int i, j;
AVProgram *program = NULL; AVProgram *program = NULL;

2
libavformat/version.h
View File

@ -30,7 +30,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 19 #define LIBAVFORMAT_VERSION_MINOR 20
#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \