summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-02-24 17:35:40 +0000
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-02-24 17:35:47 +0000
commit5eb4073781ee4962adcf8ef2749d5d8f5d104797 (patch)
tree70c3f95e9a4487f903862824d059e0e3da6a5897
parent1a12eb4a7314900b9569d6cc76814f39f95922bd (diff)
parent6b96d2dcdaa60d7919d710432c6ca204b7fab0ab (diff)
Merge commit '6b96d2dcdaa60d7919d710432c6ca204b7fab0ab'
* commit '6b96d2dcdaa60d7919d710432c6ca204b7fab0ab': cosmetics: Drop particularly redundant silly comments Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
-rw-r--r--libavcodec/h264_cavlc.c3
-rw-r--r--libavcodec/lcldec.c18
-rw-r--r--libavcodec/lclenc.c18
-rw-r--r--libavcodec/smacker.c15
4 files changed, 1 insertions, 53 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c
index b0251f405c..5998d93a79 100644
--- a/libavcodec/h264_cavlc.c
+++ b/libavcodec/h264_cavlc.c
@@ -413,9 +413,6 @@ av_cold void ff_h264_decode_init_vlc(void){
}
}
-/**
- *
- */
static inline int get_level_prefix(GetBitContext *gb){
unsigned int buf;
int log;
diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index 5507910e04..b1335e1d2f 100644
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -51,9 +51,6 @@
#include <zlib.h>
#endif
-/*
- * Decoder context
- */
typedef struct LclDecContext {
// Image type
int imgtype;
@@ -157,11 +154,6 @@ static int zlib_decomp(AVCodecContext *avctx, const uint8_t *src, int src_len, i
#endif
-/*
- *
- * Decode a frame
- *
- */
static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt)
{
AVFrame *frame = data;
@@ -472,11 +464,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
return buf_size;
}
-/*
- *
- * Init lcl decoder
- *
- */
static av_cold int decode_init(AVCodecContext *avctx)
{
LclDecContext * const c = avctx->priv_data;
@@ -631,11 +618,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
return 0;
}
-/*
- *
- * Uninit lcl decoder
- *
- */
static av_cold int decode_end(AVCodecContext *avctx)
{
LclDecContext * const c = avctx->priv_data;
diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c
index 58ad141f24..357313df49 100644
--- a/libavcodec/lclenc.c
+++ b/libavcodec/lclenc.c
@@ -49,9 +49,6 @@
#include <zlib.h>
-/*
- * Decoder context
- */
typedef struct LclEncContext {
AVCodecContext *avctx;
@@ -65,11 +62,6 @@ typedef struct LclEncContext {
z_stream zstream;
} LclEncContext;
-/*
- *
- * Encode a frame
- *
- */
static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *p, int *got_packet)
{
@@ -116,11 +108,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
return 0;
}
-/*
- *
- * Init lcl encoder
- *
- */
static av_cold int encode_init(AVCodecContext *avctx)
{
LclEncContext *c = avctx->priv_data;
@@ -170,11 +157,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
return 0;
}
-/*
- *
- * Uninit lcl encoder
- *
- */
static av_cold int encode_end(AVCodecContext *avctx)
{
LclEncContext *c = avctx->priv_data;
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index 4014e8d04c..f4fc16c42c 100644
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -43,9 +43,7 @@
#define SMKTREE_BITS 9
#define SMK_NODE 0x80000000
-/*
- * Decoder context
- */
+
typedef struct SmackVContext {
AVCodecContext *avctx;
AVFrame *pic;
@@ -549,12 +547,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
}
-
-/*
- *
- * Uninit smacker decoder
- *
- */
static av_cold int decode_end(AVCodecContext *avctx)
{
SmackVContext * const smk = avctx->priv_data;
@@ -570,11 +562,6 @@ static av_cold int decode_end(AVCodecContext *avctx)
}
-/*
- *
- * Init smacker decoder
- *
- */
static av_cold int decode_init(AVCodecContext *avctx)
{
SmackVContext * const c = avctx->priv_data;