[PATCH] avconv: Pass the actual chosen encoder to filter_codec_opts

This allows passing the right options to encoders when there's more
than one encoder for a certain codec id.
---
 avconv.c   |    4 ++--
 avplay.c   |    2 +-
 cmdutils.c |    9 +++++----
 cmdutils.h |    4 +++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/avconv.c b/avconv.c
index 3eb249d..3a7cebf 100644
--- a/avconv.c
+++ b/avconv.c
 <at>  <at>  -3441,7 +3441,7  <at>  <at>  static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
         ist->file_index = nb_input_files;
         ist->discard = 1;
         st->discard  = AVDISCARD_ALL;
-        ist->opts = filter_codec_opts(codec_opts, ist->st->codec->codec_id, ic, st);
+        ist->opts = filter_codec_opts(codec_opts, ist->st->codec->codec_id, ic, st, NULL);

         ist->ts_scale = 1.0;
         MATCH_PER_STREAM_OPT(ts_scale, dbl, ist->ts_scale, ic, st);
 <at>  <at>  -3768,7 +3768,7  <at>  <at>  static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext
*oc, e
     st->codec->codec_type = type;
     choose_encoder(o, oc, ost);
     if (ost->enc) {
-        ost->opts  = filter_codec_opts(codec_opts, ost->enc->id, oc, st);
+        ost->opts  = filter_codec_opts(codec_opts, ost->enc->id, oc, st, ost->enc);
     }