diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-02 05:48:34 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-02 06:10:30 +0400 |
| commit | 4121148388f4fd02ace89eca364904d3ea8bcfe7 (patch) | |
| tree | c346f6906942b7a12c5c1f06e9d11205ea5660ab /libavcodec/bgmc.c | |
| parent | ef611095f0d0c1256cbb6654f94cae61a60f2736 (diff) | |
| parent | f15f02c204e5fe355e084923c34dda1c6c3a66ec (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: make -frames work for all types of streams, not just video.
bfi: K&R cosmetics
bgmc: K&R cleanup
rawdec: Set start_time to 0 for raw audio files.
Detect 'yuv2' as rawvideo also in avi.
rawdec: propagate pict_type information to the output frame
rawdec: Support more QT 1bpp rawvideo files.
avconv: free bitstream filters
threads: limit the number of automatic threads to MAX_AUTO_THREADS
avplay: K&R cleanup
fate: use rgb24 as output format for dfa tests
threads: set thread_count to 1 when thread support is disabled
threads: introduce CODEC_CAP_AUTO_THREADS and add it to libx264
Conflicts:
ffplay.c
libavcodec/avcodec.h
libavcodec/pthread.c
libavcodec/version.h
tests/ref/fate/dfa1
tests/ref/fate/dfa10
tests/ref/fate/dfa11
tests/ref/fate/dfa2
tests/ref/fate/dfa3
tests/ref/fate/dfa4
tests/ref/fate/dfa5
tests/ref/fate/dfa6
tests/ref/fate/dfa7
tests/ref/fate/dfa8
tests/ref/fate/dfa9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bgmc.c')
| -rw-r--r-- | libavcodec/bgmc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/bgmc.c b/libavcodec/bgmc.c index b9041d080e..772a0af254 100644 --- a/libavcodec/bgmc.c +++ b/libavcodec/bgmc.c @@ -474,7 +474,8 @@ int ff_bgmc_init(AVCodecContext *avctx, uint8_t **cf_lut, int **cf_lut_status) av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); return AVERROR(ENOMEM); } else { - // initialize lut_status buffer to a value never used to compare against + // initialize lut_status buffer to a value never used to compare + // against memset(*cf_lut_status, -1, sizeof(*cf_lut_status) * LUT_BUFF); } @@ -494,7 +495,7 @@ void ff_bgmc_end(uint8_t **cf_lut, int **cf_lut_status) /** Initialize decoding and reads the first value */ void ff_bgmc_decode_init(GetBitContext *gb, - unsigned int *h, unsigned int *l, unsigned int *v) + unsigned int *h, unsigned int *l, unsigned int *v) { *h = TOP_VALUE; *l = 0; @@ -513,9 +514,9 @@ void ff_bgmc_decode_end(GetBitContext *gb) /** Read and decode a block Gilbert-Moore coded symbol */ void ff_bgmc_decode(GetBitContext *gb, unsigned int num, int32_t *dst, - int delta, unsigned int sx, - unsigned int *h, unsigned int *l, unsigned int *v, - uint8_t *cf_lut, int *cf_lut_status) + int delta, unsigned int sx, + unsigned int *h, unsigned int *l, unsigned int *v, + uint8_t *cf_lut, int *cf_lut_status) { unsigned int i; uint8_t *lut = bgmc_lut_getp(cf_lut, cf_lut_status, delta); @@ -567,4 +568,3 @@ void ff_bgmc_decode(GetBitContext *gb, unsigned int num, int32_t *dst, *l = low; *v = value; } - |