summaryrefslogtreecommitdiff
path: root/libavcodec/pngenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-10 14:05:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-10 14:06:20 +0200
commitbff2afb3e978c9cdffdd03a2571e4f6ddab74731 (patch)
tree7a92225c964848221a8be28232d1f6137475eb66 /libavcodec/pngenc.c
parente4fe4d01fc31bfdabf6f9b106c633139287a400d (diff)
parenta84edbacaf5adbe6e3672851aa8b3034b95787e2 (diff)
Merge remote-tracking branch 'qatar/master'
* qatar/master: x86: dsputil: Only compile motion_est code when encoders are enabled mem: fix typo in check for __ICC fate: mp3: drop redundant CMP setting rtp: Depacketization of JPEG (RFC 2435) Rename ff_put_string to avpriv_put_string mjpeg: Rename some symbols to avpriv_* instead of ff_* yadif: cosmetics Conflicts: Changelog libavcodec/mjpegenc.c libavcodec/x86/Makefile libavfilter/vf_yadif.c libavformat/version.h libavutil/mem.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pngenc.c')
0 files changed, 0 insertions, 0 deletions