diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-22 22:34:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-22 22:34:02 +0200 |
| commit | e847f4128543432a77fb8f85c313646a406c76f6 (patch) | |
| tree | c23fd3d3cd7904fae57c6a3e7395e10e58ae5579 /libavcodec | |
| parent | 492cc9bcc4a50b4213648c1b8dcb7c28d17ea8f7 (diff) | |
| parent | 9ee3334840c0d8564ca73dbfd6cd5a01bcdca79b (diff) | |
| download | ffmpeg-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')
| -rw-r--r-- | libavcodec/libspeexenc.c | 6 | ||||
| -rw-r--r-- | libavcodec/utvideo.c | 13 | ||||
| -rw-r--r-- | libavcodec/x86/rv40dsp_init.c | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c index b4a1853f6f..898625c855 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -67,6 +67,8 @@ #include <speex/speex.h> #include <speex/speex_header.h> #include <speex/speex_stereo.h> + +#include "libavutil/audioconvert.h" #include "libavutil/opt.h" #include "avcodec.h" #include "internal.h" @@ -332,6 +334,10 @@ AVCodec ff_libspeex_encoder = { .capabilities = CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, + .channel_layouts = (const uint64_t[]){ AV_CH_LAYOUT_MONO, + AV_CH_LAYOUT_STEREO, + 0 }, + .supported_samplerates = (const int[]){ 8000, 16000, 32000, 0 }, .long_name = NULL_IF_CONFIG_SMALL("libspeex Speex"), .priv_class = &class, .defaults = defaults, diff --git a/libavcodec/utvideo.c b/libavcodec/utvideo.c index 59ba7553e6..ac4438ddf7 100644 --- a/libavcodec/utvideo.c +++ b/libavcodec/utvideo.c @@ -437,16 +437,17 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, plane_start[i], c->frame_pred == PRED_LEFT); if (ret) return ret; - if (c->frame_pred == PRED_MEDIAN) + if (c->frame_pred == PRED_MEDIAN) { if (!c->interlaced) { - restore_median(c->pic.data[0] + rgb_order[i], c->planes, - c->pic.linesize[0], avctx->width, avctx->height, - c->slices, 0); + restore_median(c->pic.data[0] + rgb_order[i], c->planes, + c->pic.linesize[0], avctx->width, + avctx->height, c->slices, 0); } else { restore_median_il(c->pic.data[0] + rgb_order[i], c->planes, - c->pic.linesize[0], avctx->width, avctx->height, - c->slices, 0); + c->pic.linesize[0], avctx->width, + avctx->height, c->slices, 0); } + } } restore_rgb_planes(c->pic.data[0], c->planes, c->pic.linesize[0], avctx->width, avctx->height); diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c index 7186492d98..41ee6a74c6 100644 --- a/libavcodec/x86/rv40dsp_init.c +++ b/libavcodec/x86/rv40dsp_init.c @@ -26,8 +26,8 @@ * 3,3 is bugged in the rv40 format and maps to _xy2 version */ -#include "libavcodec/x86/dsputil_mmx.h" #include "libavcodec/rv34dsp.h" +#include "dsputil_mmx.h" void ff_put_rv40_chroma_mc8_mmx (uint8_t *dst, uint8_t *src, int stride, int h, int x, int y); |