diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 16:07:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 16:07:20 +0200 |
| commit | 9ae56b85b664f5067d0e165039303dd61e39f856 (patch) | |
| tree | 80f927c648ad2e340a541f7f674df844f5f312fb /libavcodec | |
| parent | bf66016e4c03257707e62a0c525a82b9e4fdbdae (diff) | |
| parent | d4d186d185df98492d8935a87c5b5cf369db9748 (diff) | |
| download | ffmpeg-streaming-9ae56b85b664f5067d0e165039303dd61e39f856.zip ffmpeg-streaming-9ae56b85b664f5067d0e165039303dd61e39f856.tar.gz | |
Merge commit 'd4d186d185df98492d8935a87c5b5cf369db9748'
* commit 'd4d186d185df98492d8935a87c5b5cf369db9748':
dsputil: Remove non-8bpp draw_edge
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dsputil.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 07d9376..d1e466a 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2890,13 +2890,13 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) #define FUNC(f, depth) f ## _ ## depth #define FUNCC(f, depth) f ## _ ## depth ## _c -#define BIT_DEPTH_FUNCS(depth) \ - c->get_pixels = FUNCC(get_pixels, depth); - c->draw_edges = FUNCC(draw_edges, 8); c->clear_block = FUNCC(clear_block, 8); c->clear_blocks = FUNCC(clear_blocks, 8); +#define BIT_DEPTH_FUNCS(depth) \ + c->get_pixels = FUNCC(get_pixels, depth); + switch (avctx->bits_per_raw_sample) { case 9: case 10: |
