summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-01-28 18:35:12 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-01-28 18:35:12 +0000
commit0b98a7b3b2b2cd9fe22cd693254544890b0d8fd9 (patch)
tree682295e3f12cd42e1a9fd2d80615f26a04ba132e /libavformat
parent506e4bb8bc27b0b3fd099c27084b2f28081732b5 (diff)
cosmetics, split long lines, remove useless braces, merge comments and if
Originally committed as revision 11656 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/movenc.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 2196a17720..ec700c124c 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -506,21 +506,20 @@ static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track)
} else {
if (track->enc->codec_type == CODEC_TYPE_VIDEO) {
tag = codec_get_tag(codec_movvideo_tags, track->enc->codec_id);
- // if no mac fcc found, try with Microsoft tags
- if (!tag) {
+ if (!tag) { // if no mac fcc found, try with Microsoft tags
tag = codec_get_tag(codec_bmp_tags, track->enc->codec_id);
- if (tag) {
- av_log(s, AV_LOG_INFO, "Warning, using MS style video codec tag, the file may be unplayable!\n");
- }
+ if (tag)
+ av_log(s, AV_LOG_INFO, "Warning, using MS style video codec tag, "
+ "the file may be unplayable!\n");
}
} else if (track->enc->codec_type == CODEC_TYPE_AUDIO) {
tag = codec_get_tag(codec_movaudio_tags, track->enc->codec_id);
- // if no mac fcc found, try with Microsoft tags
- if (!tag) {
+ if (!tag) { // if no mac fcc found, try with Microsoft tags
int ms_tag = codec_get_tag(codec_wav_tags, track->enc->codec_id);
if (ms_tag) {
tag = MKTAG('m', 's', ((ms_tag >> 8) & 0xff), (ms_tag & 0xff));
- av_log(s, AV_LOG_INFO, "Warning, using MS style audio codec tag, the file may be unplayable!\n");
+ av_log(s, AV_LOG_INFO, "Warning, using MS style audio codec tag, "
+ "the file may be unplayable!\n");
}
}
}