[FFmpeg-cvslog] vf_remove_logo: domt access vf->next->query_format() directly but use the API.

Michael Niedermayer git at videolan.org
Wed Sep 21 21:08:36 CEST 2011


ffmpeg | branch: release/0.8 | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 13 03:52:30 2011 +0200| [1072498081a5c8656db6df124386e171d25729fa] | committer: Michael Niedermayer

vf_remove_logo: domt access vf->next->query_format() directly but use the API.
This fixes a crash

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 39e0accb7a934bfe3d42324b016dd8790790746d)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1072498081a5c8656db6df124386e171d25729fa
---

 libavfilter/libmpcodecs/vf_remove_logo.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/libmpcodecs/vf_remove_logo.c b/libavfilter/libmpcodecs/vf_remove_logo.c
index 5f1265e..5498a1b 100644
--- a/libavfilter/libmpcodecs/vf_remove_logo.c
+++ b/libavfilter/libmpcodecs/vf_remove_logo.c
@@ -671,7 +671,7 @@ static pgm_structure * generate_half_size_image(vf_instance_t * vf, pgm_structur
  * \brief Checks if YV12 is supported by the next filter.
  */
 static unsigned int find_best(struct vf_instance *vf){
-  int is_format_okay = vf->next->query_format(vf->next, IMGFMT_YV12);
+  int is_format_okay = vf_next_query_format(vf, IMGFMT_YV12);
   if ((is_format_okay & VFCAP_CSP_SUPPORTED_BY_HW) || (is_format_okay & VFCAP_CSP_SUPPORTED))
     return IMGFMT_YV12;
   else
@@ -814,7 +814,7 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
 static int query_format(struct vf_instance *vf, unsigned int fmt)
 {
   if (fmt == IMGFMT_YV12)
-    return vf->next->query_format(vf->next, IMGFMT_YV12);
+    return vf_next_query_format(vf, IMGFMT_YV12);
   else
     return 0;
 }



More information about the ffmpeg-cvslog mailing list