aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2006-07-28 23:07:03 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2006-07-28 23:07:03 +0000
commitb7522224399f65a0112c4bfbcbbc70264db3bc17 (patch)
tree0cdb37535b4bd87a68049c63fee6569e1a9fd9aa /libavformat
parent834bff48cbafe4e9c24fc380fd7a3fabd9bfa330 (diff)
downloadffmpeg-b7522224399f65a0112c4bfbcbbc70264db3bc17.tar.gz
use ternary
Originally committed as revision 5841 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mxf.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/libavformat/mxf.c b/libavformat/mxf.c
index 2fcd93f14a..1dbe9edb47 100644
--- a/libavformat/mxf.c
+++ b/libavformat/mxf.c
@@ -197,10 +197,7 @@ static int klv_read_packet(KLVPacket *klv, ByteIOContext *pb)
klv->offset = url_ftell(pb);
get_buffer(pb, klv->key, 16);
klv->length = klv_decode_ber_length(pb);
- if (klv->length == -1)
- return -1;
- else
- return 0;
+ return klv->length == -1 ? -1 : 0;
}
static int mxf_get_stream_index(AVFormatContext *s, KLVPacket *klv)
@@ -227,9 +224,7 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt)
if (IS_KLV_KEY(klv.key, mxf_essence_element_key)) {
av_get_packet(&s->pb, pkt, klv.length);
pkt->stream_index = mxf_get_stream_index(s, &klv);
- if (pkt->stream_index == -1)
- return -1;
- return 0;
+ return pkt->stream_index == -1 ? -1 : 0;
} else
url_fskip(&s->pb, klv.length);
}