1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit '71d6551e674c86d07c165439c2bf6613b3892307'

* commit '71d6551e674c86d07c165439c2bf6613b3892307':
  avconv: use the correct variable in comparison

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-17 12:57:56 +02:00
commit fa0d0fb42e

View File

@ -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";
}