aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/cutils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-21 03:23:46 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-21 03:37:05 +0200
commit10d2ae8cf78ed7e23c6342200fa4d8a5355e87f2 (patch)
treead169614a86989dbb4ead1e188d2ad71ef7bfcf7 /libavformat/cutils.c
parent2c18893a911657205bd45ff8a666882610e57700 (diff)
parentf83acb096c0ea1ec181941c141d1ab6fb24820eb (diff)
downloadffmpeg-10d2ae8cf78ed7e23c6342200fa4d8a5355e87f2.tar.gz
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 'libavformat/cutils.c')
0 files changed, 0 insertions, 0 deletions