diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-11 14:50:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-11 15:01:45 +0200 |
| commit | f5f3684fb8d3881a6f90913417b2b5272df76e49 (patch) | |
| tree | 2cd82a73afe553baeed57683b861e6775ccebb6b /libavformat | |
| parent | 48d20b918c80a68e61f8bdedbf335ed4a00d6a32 (diff) | |
| parent | 885da7b08289321b88919e86d1574c8683a95a22 (diff) | |
| download | ffmpeg-f5f3684fb8d3881a6f90913417b2b5272df76e49.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: simplify is_intra_only() by using codec descriptors.
lavc: add an intra-only codec property.
lavc: add codec descriptors.
lavc: fix mixing CODEC_ID/AV_CODEC_ID in C++ code.
dict: move struct AVDictionary definition to dict.c
dict: add av_dict_count()
Conflicts:
doc/APIchanges
libavcodec/old_codec_ids.h
libavformat/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/asfenc.c | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 79f21a37f7..23f11427e1 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -318,7 +318,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data duration = asf->duration + PREROLL_TIME * 10000; has_title = tags[0] || tags[1] || tags[2] || tags[3] || tags[4]; - metadata_count = s->metadata ? s->metadata->count : 0; + metadata_count = av_dict_count(s->metadata); bit_rate = 0; for(n=0;n<s->nb_streams;n++) { diff --git a/libavformat/utils.c b/libavformat/utils.c index f55e1e6de5..869257aae1 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1157,7 +1157,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, // presentation_delayed, delay, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts)); /* update flags */ - if(is_intra_only(st->codec)) + if (is_intra_only(st->codec)) pkt->flags |= AV_PKT_FLAG_KEY; if (pc) pkt->convergence_duration = pc->convergence_duration; @@ -3802,7 +3802,7 @@ static void print_fps(double d, const char *postfix){ static void dump_metadata(void *ctx, AVDictionary *m, const char *indent) { - if(m && !(m->count == 1 && av_dict_get(m, "language", NULL, 0))){ + if(m && !(av_dict_count(m) == 1 && av_dict_get(m, "language", NULL, 0))){ AVDictionaryEntry *tag=NULL; av_log(ctx, AV_LOG_INFO, "%sMetadata:\n", indent); |