[SCM] libav/experimental: Fix AVFormat AVOprions.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6299a22904d00d6d628eaa7ab0c648f70dfa970d
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Jan 30 22:47:08 2010 +0000

    Fix AVFormat AVOprions.
    
    Originally committed as revision 21561 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffplay.c b/ffplay.c
index 69588d6..eaabefd 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1881,6 +1881,8 @@ static int decode_thread(void *arg)
     AVFormatParameters params, *ap = ¶ms;
     int eof=0;
 
+    ic = avformat_alloc_context();
+
     video_index = -1;
     audio_index = -1;
     subtitle_index = -1;
@@ -1893,11 +1895,14 @@ static int decode_thread(void *arg)
 
     memset(ap, 0, sizeof(*ap));
 
+    ap->prealloced_context = 1;
     ap->width = frame_width;
     ap->height= frame_height;
     ap->time_base= (AVRational){1, 25};
     ap->pix_fmt = frame_pix_fmt;
 
+    set_context_opts(ic, avformat_opts, AV_OPT_FLAG_DECODING_PARAM);
+
     err = av_open_input_file(&ic, is->filename, is->iformat, 0, ap);
     if (err < 0) {
         print_error(is->filename, err);

-- 
Libav/FFmpeg packaging