Mercurial > mplayer.hg
comparison command.c @ 32511:b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
patch by From: Clment Bsch, ubitux gmail com
| author | diego |
|---|---|
| date | Sun, 07 Nov 2010 12:47:40 +0000 |
| parents | fbe5c829c69b |
| children | 17bb5a38ae2e |
comparison
equal
deleted
inserted
replaced
| 32510:b756312f1d15 | 32511:b39155e98ac3 |
|---|---|
| 510 else if (step_all > 0) | 510 else if (step_all > 0) |
| 511 rel_seek_secs = 1000000000.; | 511 rel_seek_secs = 1000000000.; |
| 512 else | 512 else |
| 513 set_osd_msg(OSD_MSG_TEXT, 1, osd_duration, | 513 set_osd_msg(OSD_MSG_TEXT, 1, osd_duration, |
| 514 MSGTR_OSDChapter, 0, MSGTR_Unknown); | 514 MSGTR_OSDChapter, 0, MSGTR_Unknown); |
| 515 if (chapter_name) | 515 free(chapter_name); |
| 516 free(chapter_name); | |
| 517 return M_PROPERTY_OK; | 516 return M_PROPERTY_OK; |
| 518 } | 517 } |
| 519 | 518 |
| 520 /// Number of chapters in file | 519 /// Number of chapters in file |
| 521 static int mp_property_chapters(m_option_t *prop, int action, void *arg, | 520 static int mp_property_chapters(m_option_t *prop, int action, void *arg, |
| 583 return M_PROPERTY_NOT_IMPLEMENTED; | 582 return M_PROPERTY_NOT_IMPLEMENTED; |
| 584 } | 583 } |
| 585 angle = demuxer_set_angle(mpctx->demuxer, angle); | 584 angle = demuxer_set_angle(mpctx->demuxer, angle); |
| 586 set_osd_msg(OSD_MSG_TEXT, 1, osd_duration, | 585 set_osd_msg(OSD_MSG_TEXT, 1, osd_duration, |
| 587 MSGTR_OSDAngle, angle, angles); | 586 MSGTR_OSDAngle, angle, angles); |
| 588 if (angle_name) | 587 free(angle_name); |
| 589 free(angle_name); | |
| 590 return M_PROPERTY_OK; | 588 return M_PROPERTY_OK; |
| 591 } | 589 } |
| 592 | 590 |
| 593 /// Demuxer meta data | 591 /// Demuxer meta data |
| 594 static int mp_property_metadata(m_option_t *prop, int action, void *arg, | 592 static int mp_property_metadata(m_option_t *prop, int action, void *arg, |