Mercurial > mplayer.hg
annotate libmpcodecs/ve_x264.h @ 33307:552f1f7731c8
Set GUI initialization flag earlier.
So far, the flag is set after the call of guiInit(), but there are calls
to GUI functions (like reading the GUI config) before that. As MPlayer
(when exiting) only calls GUI's cleanup function guiDone() if the flag
is set, it neglects calling guiDone() on any error between the first GUI
function call and execution of guiInit(). Now the flag is set before the
first GUI function call.
As a result, GUI's own exit function (also used for fatal GUI errors, and
thus also for errors occurring before guiInit() properly finishes) doesn't
have to handle cleanup any longer. The code can be moved to guiDone().
author | ib |
---|---|
date | Sat, 07 May 2011 15:30:14 +0000 |
parents | e4c7703dd901 |
children |
rev | line source |
---|---|
30949
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
1 /* |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
2 * This file is part of MPlayer. |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
3 * |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
7 * (at your option) any later version. |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
8 * |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
12 * GNU General Public License for more details. |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
13 * |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
17 */ |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
18 |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
19 #ifndef MPLAYER_X264_H |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
20 #define MPLAYER_X264_H |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
21 |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
22 #include "m_option.h" |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
23 |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
24 void x264enc_set_param(const m_option_t* opt, char* arg); |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
25 |
e4c7703dd901
Add a header for x264enc_set_param() instead of forward declaring it.
diego
parents:
diff
changeset
|
26 #endif /* MPLAYER_X264_H */ |