summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorRodney Baker <rodney.baker@iinet.net.au>2010-07-03 15:35:23 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2010-07-03 15:35:23 +0000
commit2d525ef483df1adbc6e22bbb27467033a90cc196 (patch)
tree5293bacc005b5114137a48fb743c150ca06ac0f6 /ffmpeg.c
parenta07a06b0334529be6d047db6b0c85a85182e2f42 (diff)
Change all occurences of "inofficial" to "unofficial" in code, comments
and options. Keep old options until next major version bump. Patch by Rodney Baker, rodney d baker a iinet d net d au Originally committed as revision 24021 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index e5d8b260a9..908c384d8c 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -688,7 +688,7 @@ static void choose_pixel_fmt(AVStream *st, AVCodec *codec)
}
if(*p == -1
&& !( st->codec->codec_id==CODEC_ID_MJPEG
- && st->codec->strict_std_compliance <= FF_COMPLIANCE_INOFFICIAL
+ && st->codec->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL
&& ( st->codec->pix_fmt == PIX_FMT_YUV420P
|| st->codec->pix_fmt == PIX_FMT_YUV422P)))
st->codec->pix_fmt = codec->pix_fmts[0];