[FFmpeg-cvslog] ffmpeg: fix broken channel_layout option

[Matthieu Bouron]

ffmpeg | branch: release/1.1 | Matthieu Bouron <matthieu.bouron at gmail.com> | Fri Feb  1 18:58:14 2013 +0100| [c8dace272829365905d67f6f2bf76668135472d5] | committer: Carl Eugen Hoyos

ffmpeg: fix broken channel_layout option

Fixes ticket #2163.

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

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

 ffmpeg_opt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 3af33e6..46c917a 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -2148,7 +2148,7 @@ static int opt_channel_layout(void *optctx, const char *opt, const char *arg)
         return AVERROR(EINVAL);
     }
     snprintf(layout_str, sizeof(layout_str), "%"PRIu64, layout);
-    ret = opt_default(NULL, opt, layout_str);
+    ret = opt_default_new(o, opt, layout_str);
     if (ret < 0)
         return ret;