[SCM] libav/wheezy-security: parser: Don't use pc as context for av_dlog

[siretart at users.alioth.debian.org]

The following commit has been merged in the wheezy-security branch:
commit 372f742dd18911dc5c6552b1bb2e2ca235c5ee47
Author: Martin Storsjö <martin at martin.st>
Date:   Tue Sep 4 14:45:00 2012 +0300

    parser: Don't use pc as context for av_dlog
    
    The ParserContext class doesn't have an AVClass, required for
    using it as a logging class.
    
    Signed-off-by: Martin Storsjö <martin at martin.st>
    (cherry picked from commit 6d65496990dcac551f60668c2418a50a3111c86c)
    Signed-off-by: Diego Biurrun <diego at biurrun.de>

diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 1bb5f8c..59fec40 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -222,9 +222,9 @@ void av_parser_close(AVCodecParserContext *s)
 int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size)
 {
     if(pc->overread){
-        av_dlog(pc, "overread %d, state:%X next:%d index:%d o_index:%d\n",
+        av_dlog(NULL, "overread %d, state:%X next:%d index:%d o_index:%d\n",
                 pc->overread, pc->state, next, pc->index, pc->overread_index);
-        av_dlog(pc, "%X %X %X %X\n", (*buf)[0], (*buf)[1], (*buf)[2], (*buf)[3]);
+        av_dlog(NULL, "%X %X %X %X\n", (*buf)[0], (*buf)[1], (*buf)[2], (*buf)[3]);
     }
 
     /* Copy overread bytes from last frame into buffer. */
@@ -276,9 +276,9 @@ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_s
     }
 
     if(pc->overread){
-        av_dlog(pc, "overread %d, state:%X next:%d index:%d o_index:%d\n",
+        av_dlog(NULL, "overread %d, state:%X next:%d index:%d o_index:%d\n",
                 pc->overread, pc->state, next, pc->index, pc->overread_index);
-        av_dlog(pc, "%X %X %X %X\n", (*buf)[0], (*buf)[1],(*buf)[2],(*buf)[3]);
+        av_dlog(NULL, "%X %X %X %X\n", (*buf)[0], (*buf)[1],(*buf)[2],(*buf)[3]);
     }
 
     return 0;

-- 
Libav/FFmpeg packaging