aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264_refs.c
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-02-24 17:31:44 +0000
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-02-24 17:31:44 +0000
commit1a12eb4a7314900b9569d6cc76814f39f95922bd (patch)
tree8f4644f71ca5f336b1cbb1434b7087bcdf2192dd /libavcodec/h264_refs.c
parentcb0355537d6a89fc71fbc672ad5dba8a1eadce34 (diff)
parent29c2d06d67724e994980045afa055c6c34611b30 (diff)
downloadffmpeg-1a12eb4a7314900b9569d6cc76814f39f95922bd.tar.gz
Merge commit '29c2d06d67724e994980045afa055c6c34611b30'
* commit '29c2d06d67724e994980045afa055c6c34611b30': cosmetics: Drop empty comment lines Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/h264_refs.c')
-rw-r--r--libavcodec/h264_refs.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index d46d940dae..35e254e095 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -467,7 +467,6 @@ static void remove_short_at_index(H264Context *h, int i)
}
/**
- *
* @return the removed picture or NULL if an error occurs
*/
static H264Picture *remove_short(H264Context *h, int frame_num, int ref_mask)