Mercurial > mplayer.hg
annotate mencoder.h @ 33667:adb10970ec83
Fix bug introduced as a side effect in r33750.
It was no longer possible to start gmplayer from the command line with
a file argument.
Every time gmplayer is called with a file argument this file goes into
the GUI specific playlist. As a side effect, GUI's file(name) to play
and MPlayer's filename point to the same address.
guiInit() pointlessly tries to set GUI's filename (free and strdup) from
MPlayer's filename instead of getting it from its playlist. The previous
memset set GUI's filename to NULL rendering the free() effectless while
now such an operation on the same address to strdup() afterwards isn't a
good idea.
Remove the pointless code.
author | ib |
---|---|
date | Tue, 28 Jun 2011 15:00:05 +0000 |
parents | a735105a66b6 |
children |
rev | line source |
---|---|
32064
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
1 /* |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
2 * This file is part of MPlayer. |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
3 * |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
7 * (at your option) any later version. |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
8 * |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
12 * GNU General Public License for more details. |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
13 * |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
17 */ |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
18 |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
19 #ifndef MPLAYER_MENCODER_H |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
20 #define MPLAYER_MENCODER_H |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
21 |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
22 extern char *info_artist; |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
23 extern char *info_comment; |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
24 extern char *info_copyright; |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
25 extern char *info_genre; |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
26 extern char *info_name; |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
27 extern char *info_sourceform; |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
28 extern char *info_subject; |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
29 extern char *out_filename; |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
30 extern char *passtmpfile; |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
31 |
a735105a66b6
Move all MEncoder-related extern variable declarations to mencoder.h.
diego
parents:
diff
changeset
|
32 #endif /* MPLAYER_MENCODER_H */ |