diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 15:40:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 15:53:23 +0200 |
| commit | 862120f98049dc4bd0919d431a4f07a64fab77ec (patch) | |
| tree | 673da894922c63ef3ec8fc25674e77697e09cad3 /ffmpeg_filter.c | |
| parent | a87685d8e8c13b6339412f99f08a419681e5ced5 (diff) | |
| parent | 383136264ef40452efd86cafb2d7221cd3830b3d (diff) | |
Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d'
* commit '383136264ef40452efd86cafb2d7221cd3830b3d':
avconv: do not use the stream codec context for encoding
Conflicts:
ffmpeg.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
| -rw-r--r-- | ffmpeg_filter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 68cf4f227c..ae28034590 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -149,8 +149,8 @@ static char *choose_pix_fmts(OutputStream *ost) #define DEF_CHOOSE_FORMAT(type, var, supported_list, none, get_name) \ static char *choose_ ## var ## s(OutputStream *ost) \ { \ - if (ost->st->codec->var != none) { \ - get_name(ost->st->codec->var); \ + if (ost->enc_ctx->var != none) { \ + get_name(ost->enc_ctx->var); \ return av_strdup(name); \ } else if (ost->enc && ost->enc->supported_list) { \ const type *p; \ @@ -344,7 +344,7 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, char *pix_fmts; OutputStream *ost = ofilter->ost; OutputFile *of = output_files[ost->file_index]; - AVCodecContext *codec = ost->st->codec; + AVCodecContext *codec = ost->enc_ctx; AVFilterContext *last_filter = out->filter_ctx; int pad_idx = out->pad_idx; int ret; @@ -434,7 +434,7 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter, { OutputStream *ost = ofilter->ost; OutputFile *of = output_files[ost->file_index]; - AVCodecContext *codec = ost->st->codec; + AVCodecContext *codec = ost->enc_ctx; AVFilterContext *last_filter = out->filter_ctx; int pad_idx = out->pad_idx; char *sample_fmts, *sample_rates, *channel_layouts; |