sgidec: make compiler optimize away memcpy call in inner loop.

[ffmpeg] / libavcodec / libdirac_libschro.c

diff --git a/libavcodec/libdirac_libschro.c b/libavcodec/libdirac_libschro.c
index aee185885e69de26409fdfb13189058e5f5a9713..c8657e2fd2349991cb9b155cc15dc2d77e5f6b0d 100644 (file)
--- a/libavcodec/libdirac_libschro.c
+++ b/libavcodec/libdirac_libschro.c
@@ -25,7 +25,7 @@
 
 #include "libdirac_libschro.h"
 
-static const FfmpegDiracSchroVideoFormatInfo ff_dirac_schro_video_format_info[] = {
+static const DiracSchroVideoFormatInfo ff_dirac_schro_video_format_info[] = {
     { 640,  480,  24000, 1001},
     { 176,  120,  15000, 1001},
     { 176,  144,  25,    2   },
@@ -53,7 +53,7 @@ unsigned int ff_dirac_schro_get_video_format_idx(AVCodecContext *avccontext)
                                sizeof(ff_dirac_schro_video_format_info[0]);
 
     for (idx = 1; idx < num_formats; ++idx) {
-        const FfmpegDiracSchroVideoFormatInfo *vf = &ff_dirac_schro_video_format_info[idx];
+        const DiracSchroVideoFormatInfo *vf = &ff_dirac_schro_video_format_info[idx];
         if (avccontext->width  == vf->width &&
             avccontext->height == vf->height) {
             ret_idx = idx;
@@ -65,22 +65,22 @@ unsigned int ff_dirac_schro_get_video_format_idx(AVCodecContext *avccontext)
     return ret_idx;
 }
 
-void ff_dirac_schro_queue_init(FfmpegDiracSchroQueue *queue)
+void ff_dirac_schro_queue_init(DiracSchroQueue *queue)
 {
     queue->p_head = queue->p_tail = NULL;
     queue->size = 0;
 }
 
-void ff_dirac_schro_queue_free(FfmpegDiracSchroQueue *queue,
+void ff_dirac_schro_queue_free(DiracSchroQueue *queue,
                                void (*free_func)(void *))
 {
     while (queue->p_head)
         free_func(ff_dirac_schro_queue_pop(queue));
 }
 
-int ff_dirac_schro_queue_push_back(FfmpegDiracSchroQueue *queue, void *p_data)
+int ff_dirac_schro_queue_push_back(DiracSchroQueue *queue, void *p_data)
 {
-    FfmpegDiracSchroQueueElement *p_new = av_mallocz(sizeof(FfmpegDiracSchroQueueElement));
+    DiracSchroQueueElement *p_new = av_mallocz(sizeof(DiracSchroQueueElement));
 
     if (!p_new)
         return -1;
@@ -97,9 +97,9 @@ int ff_dirac_schro_queue_push_back(FfmpegDiracSchroQueue *queue, void *p_data)
     return 0;
 }
 
-void *ff_dirac_schro_queue_pop(FfmpegDiracSchroQueue *queue)
+void *ff_dirac_schro_queue_pop(DiracSchroQueue *queue)
 {
-    FfmpegDiracSchroQueueElement *top = queue->p_head;
+    DiracSchroQueueElement *top = queue->p_head;
 
     if (top) {
         void *data = top->data;