aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/ivfenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-22 22:26:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-22 22:26:42 +0200
commit92ef4be4ab9fbb7d901b22e0036a4ca90b00a476 (patch)
treec04ededf84f089de4f9ef417ca6ecc715b84fa4b /libavformat/ivfenc.c
parent2e07f42957666df6d7c63a62263b8447e97b1442 (diff)
parentd526c5338d50d12a54fd95130030c60070707d3e (diff)
downloadffmpeg-92ef4be4ab9fbb7d901b22e0036a4ca90b00a476.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: ARM: allow runtime masking of CPU features dsputil: remove unused functions mov: Treat keyframe indexes as 1-origin if starting at non-zero. mov: Take stps entries into consideration also about key_off. Remove lowres video decoding Conflicts: ffmpeg.c ffplay.c libavcodec/arm/vp8dsp_init_arm.c libavcodec/libopenjpegdec.c libavcodec/mjpegdec.c libavcodec/mpegvideo.c libavcodec/utils.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ivfenc.c')
0 files changed, 0 insertions, 0 deletions