]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
Get rid of useless braces
authorconrad <conrad@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Wed, 5 Sep 2007 00:25:58 +0000 (00:25 +0000)
committerconrad <conrad@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Wed, 5 Sep 2007 00:25:58 +0000 (00:25 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@10382 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavformat/matroskaenc.c

index b300455b9b8d19c33e00472a526169af8d165688..34e1d41925430dcd0ddc120cac6596adddec9870 100644 (file)
@@ -473,13 +473,12 @@ static int mkv_write_codecprivate(ByteIOContext *pb, AVCodecContext *codec, int
     url_open_dyn_buf(&dyn_cp);
 
     if (native_id) {
-        if (codec->codec_id == CODEC_ID_VORBIS || codec->codec_id == CODEC_ID_THEORA) {
+        if (codec->codec_id == CODEC_ID_VORBIS || codec->codec_id == CODEC_ID_THEORA)
             ret = put_xiph_codecpriv(&dyn_cp, codec);
-        } else if (codec->codec_id == CODEC_ID_FLAC) {
+        else if (codec->codec_id == CODEC_ID_FLAC)
             ret = put_flac_codecpriv(&dyn_cp, codec);
-        } else if (codec->extradata_size) {
+        else if (codec->extradata_size)
             put_buffer(&dyn_cp, codec->extradata, codec->extradata_size);
-        }
     } else if (codec->codec_type == CODEC_TYPE_VIDEO) {
         if (!codec->codec_tag)
             codec->codec_tag = codec_get_tag(codec_bmp_tags, codec->codec_id);
@@ -558,10 +557,10 @@ static int mkv_write_tracks(AVFormatContext *s)
             case CODEC_TYPE_VIDEO:
                 put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_VIDEO);
 
-                if (!native_id) {
+                if (!native_id)
                     // if there is no mkv-specific codec id, use VFW mode
                     put_ebml_string(pb, MATROSKA_ID_CODECID, MATROSKA_CODEC_ID_VIDEO_VFW_FOURCC);
-                }
+
                 subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKVIDEO, 0);
                 // XXX: interlace flag?
                 put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELWIDTH , codec->width);
@@ -578,10 +577,10 @@ static int mkv_write_tracks(AVFormatContext *s)
             case CODEC_TYPE_AUDIO:
                 put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO);
 
-                if (!native_id) {
+                if (!native_id)
                     // no mkv-specific ID, use ACM mode
                     put_ebml_string(pb, MATROSKA_ID_CODECID, MATROSKA_CODEC_ID_AUDIO_ACM);
-                }
+
                 subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKAUDIO, 0);
                 put_ebml_uint  (pb, MATROSKA_ID_AUDIOCHANNELS    , codec->channels);
                 put_ebml_float (pb, MATROSKA_ID_AUDIOSAMPLINGFREQ, sample_rate);