Merge commit '71d6551e674c86d07c165439c2bf6613b3892307'
* commit '71d6551e674c86d07c165439c2bf6613b3892307': avconv: use the correct variable in comparison Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
fa0d0fb42e
2
ffmpeg.c
2
ffmpeg.c
@ -2999,7 +2999,7 @@ static int transcode_init(void)
|
|||||||
if (out_codec) {
|
if (out_codec) {
|
||||||
encoder_name = out_codec->name;
|
encoder_name = out_codec->name;
|
||||||
out_codec_name = avcodec_descriptor_get(out_codec->id)->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";
|
encoder_name = "native";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user