diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-21 03:23:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-21 03:37:05 +0200 |
| commit | 10d2ae8cf78ed7e23c6342200fa4d8a5355e87f2 (patch) | |
| tree | ad169614a86989dbb4ead1e188d2ad71ef7bfcf7 /libavutil/log.c | |
| parent | 2c18893a911657205bd45ff8a666882610e57700 (diff) | |
| parent | f83acb096c0ea1ec181941c141d1ab6fb24820eb (diff) | |
Merge remote branch 'qatar/master'
* qatar/master:
Makefile: Include dependencies for test tools, too
Remove a version check in av_log made unnecessary by the big bump.
update last major version increase dates in APIchanges
Reduce picture size for yadif.
oggdec: use av_freep() instead of av_free()
avio: Fix sanity checks in ffurl_read*
libavformat: Free AVFormatContext->streams
libavformat: Make protocols pass URLContext as log context where available
asf: remove commented out code in asf_read_seek
not pulled: libpostproc: Remove crufty code disabled by the big bump.
Reflect 0.7_beta1 release in the Changelog
not pulled: sws: remove disabled cruft.
lavu: remove disabled ff_random_get_seed cruft.
lavu: remove disabled sha1 cruft.
Conflicts:
Changelog
libavutil/sha1.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/log.c')
| -rw-r--r-- | libavutil/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/log.c b/libavutil/log.c index d7daaa2706..c9a4f7f9aa 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -100,7 +100,7 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) line[0]=0; #undef fprintf if(print_prefix && avc) { - if(avc->version >= (50<<16 | 15<<8 | 3) && avc->parent_log_context_offset){ + if (avc->parent_log_context_offset) { AVClass** parent= *(AVClass***)(((uint8_t*)ptr) + avc->parent_log_context_offset); if(parent && *parent){ snprintf(line, sizeof(line), "[%s @ %p] ", (*parent)->item_name(parent), parent); |