diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-25 02:29:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-25 02:29:09 +0200 |
| commit | 989fb05fe344d9666db858e0577c44969625184e (patch) | |
| tree | 294cb628ae90187c545eb7b0a28de2d304898888 /libavformat/applehttp.c | |
| parent | 2671ab3996672c43b02076daca5bf00c5a6f1c68 (diff) | |
| parent | 2441003d3fdc01545690c2f397efd7acfd876d6c (diff) | |
Merge remote branch 'qatar/master'
* qatar/master:
vorbisdec: Employ proper printf format specifiers for uint_fast32_t.
applehttp: Don't export variant_bitrate if it isn't known
crypto: Use av_freep instead of av_free
configure: Add missing libm library dependencies to .pc files.
oggdec: reindent after 8f3eebd6
configure: Add missing libavutil inter-library dependencies to .pc files.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/applehttp.c')
| -rw-r--r-- | libavformat/applehttp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/applehttp.c b/libavformat/applehttp.c index 93d4f73295..4429ad0199 100644 --- a/libavformat/applehttp.c +++ b/libavformat/applehttp.c @@ -505,7 +505,9 @@ static int applehttp_read_header(AVFormatContext *s, AVFormatParameters *ap) goto fail; } avcodec_copy_context(st->codec, v->ctx->streams[j]->codec); - av_metadata_set2(&st->metadata, "variant_bitrate", bitrate_str, 0); + if (v->bandwidth) + av_metadata_set2(&st->metadata, "variant_bitrate", bitrate_str, + 0); } stream_offset += v->ctx->nb_streams; } |