Reorganize long reference management to minimize code duplication in upcoming PAFF...

patch by Jeff Downs, heydowns a borg d com
original thread:
Subject: [FFmpeg-devel] [PATCH] Implement PAFF in H.264
Date: 18/09/07 20:30

Originally committed as revision 10665 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 8487c86af7f1a4e4aea0909dc11644489cc4df10..0a11487707d39069b9d3dcd642f1e942f366b22a 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3223,6 +3223,17 @@ static Picture * remove_short(H264Context *h, int frame_num){
     return pic;
 }
 
+/**
+ * Remove a picture from the long term reference list by its index in
+ * that list.  This does no checking on the provided index; it is assumed
+ * to be valid. The removed entry is set to NULL. Other entries are unaffected.
+ * @param i index into h->long_ref of picture to remove.
+ */
+static void remove_long_at_index(H264Context *h, int i){
+    h->long_ref[i]= NULL;
+    h->long_ref_count--;
+}
+
 /**
  *
  * @return the removed picture or NULL if an error occurs
@@ -3231,8 +3242,8 @@ static Picture * remove_long(H264Context *h, int i){
     Picture *pic;
 
     pic= h->long_ref[i];
-    h->long_ref[i]= NULL;
-    if(pic) h->long_ref_count--;
+    if (pic)
+        remove_long_at_index(h, i);
 
     return pic;
 }