# HG changeset patch # User reimar # Date 1257456445 0 # Node ID 9fbb75fb4e2d273e2ab6e9ad43c76754ce484bea # Parent f60a8ab8c31cbcf3ea3456d19b8a1864d17f6c23 Cosmetics: indentation, merge two consecutive ifs. diff -r f60a8ab8c31c -r 9fbb75fb4e2d stream/stream_dvdnav.c --- a/stream/stream_dvdnav.c Thu Nov 05 21:26:23 2009 +0000 +++ b/stream/stream_dvdnav.c Thu Nov 05 21:27:25 2009 +0000 @@ -538,12 +538,10 @@ if(format == 0xFFFF || format > 6) format = 1; //unknown id = i + base[format]; - mp_msg(MSGT_OPEN,MSGL_STATUS,MSGTR_DVDaudioStreamInfo, i, - dvd_audio_stream_types[format], dvd_audio_stream_channels[channels], tmp, id); - if (lang != 0xFFFF) { - if(lang && tmp[0]) + mp_msg(MSGT_OPEN,MSGL_STATUS,MSGTR_DVDaudioStreamInfo, i, + dvd_audio_stream_types[format], dvd_audio_stream_channels[channels], tmp, id); + if (lang != 0xFFFF && lang && tmp[0]) mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_LANG=%s\n", id, tmp); - } } for(i=0; i<32; i++) @@ -558,7 +556,7 @@ tmp[1] = lang & 0xFF; tmp[2] = 0; } - mp_msg(MSGT_OPEN,MSGL_STATUS,MSGTR_DVDsubtitleLanguage, i, tmp); + mp_msg(MSGT_OPEN,MSGL_STATUS,MSGTR_DVDsubtitleLanguage, i, tmp); } }