diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-24 16:13:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-24 16:20:07 +0100 |
| commit | 7681b8e9a922b9c1b45d95e2585b716a1caed360 (patch) | |
| tree | abcd015f2c160784cae4ccef96abff2bc3b32601 /libavcodec/zmbv.c | |
| parent | 9dbedf331eca9903230368f28716f29e7375450a (diff) | |
| parent | 0a9132b84c0590500bb3d6b358219323805993fc (diff) | |
| download | ffmpeg-7681b8e9a922b9c1b45d95e2585b716a1caed360.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wnv1: cosmetics, reformat
xan: remove a trivially true if().
ansi: do not depend on get_buffer() initializing the frame.
zerocodec: remove an unused variable.
zmbv: remove some pointless comments and empty lines
Conflicts:
libavcodec/xan.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/zmbv.c')
| -rw-r--r-- | libavcodec/zmbv.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 167f6f8826..83743c52a2 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -608,13 +608,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac return buf_size; } - - -/* - * - * Init zmbv decoder - * - */ static av_cold int decode_init(AVCodecContext *avctx) { ZmbvContext * const c = avctx->priv_data; @@ -655,13 +648,6 @@ static av_cold int decode_init(AVCodecContext *avctx) return 0; } - - -/* - * - * Uninit zmbv decoder - * - */ static av_cold int decode_end(AVCodecContext *avctx) { ZmbvContext * const c = avctx->priv_data; |