diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-17 14:57:56 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-17 14:58:16 +0400 |
commit | fa0d0fb42ecda5d9676c744195fd9ef0454c259d (patch) | |
tree | f446e564af0f956f23fa39cbbfad722a533ac50b /ffmpeg.c | |
parent | 61df0819d49ba831948681a7e8aa1a6def26b1a9 (diff) | |
parent | 71d6551e674c86d07c165439c2bf6613b3892307 (diff) |
Merge commit '71d6551e674c86d07c165439c2bf6613b3892307'
* commit '71d6551e674c86d07c165439c2bf6613b3892307':
avconv: use the correct variable in comparison
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2999,7 +2999,7 @@ static int transcode_init(void) if (out_codec) { encoder_name = out_codec->name; out_codec_name = avcodec_descriptor_get(out_codec->id)->name; - if (!strcmp(encoder_name, in_codec_name)) + if (!strcmp(encoder_name, out_codec_name)) encoder_name = "native"; } |