aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/kmvc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-22 22:34:02 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-22 22:34:02 +0200
commite847f4128543432a77fb8f85c313646a406c76f6 (patch)
treec23fd3d3cd7904fae57c6a3e7395e10e58ae5579 /libavcodec/kmvc.c
parent492cc9bcc4a50b4213648c1b8dcb7c28d17ea8f7 (diff)
parent9ee3334840c0d8564ca73dbfd6cd5a01bcdca79b (diff)
downloadffmpeg-e847f4128543432a77fb8f85c313646a406c76f6.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: libspeexenc: add supported sample rates and channel layouts. Replace usleep() calls with av_usleep() lavu: add av_usleep() function utvideo: mark interlaced frames as such utvideo: Fix interlaced prediction for RGB utvideo. cosmetics: do not use full path for local headers lavu/file: include unistd.h only when available configure: check for unistd.h log: include unistd.h only when needed lavf: include libavutil/time.h instead of redeclaring av_gettime() Conflicts: configure doc/APIchanges ffmpeg.c ffplay.c libavcodec/utvideo.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/kmvc.c')
0 files changed, 0 insertions, 0 deletions