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>
This commit is contained in:
@@ -80,11 +80,3 @@ uint32_t av_get_random_seed(void)
|
||||
return seed;
|
||||
return get_generic_seed();
|
||||
}
|
||||
|
||||
#if LIBAVUTIL_VERSION_MAJOR < 51
|
||||
attribute_deprecated uint32_t ff_random_get_seed(void);
|
||||
uint32_t ff_random_get_seed(void)
|
||||
{
|
||||
return av_get_random_seed();
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user