Mercurial > mplayer.hg
annotate fmt-conversion.h @ 33526:140525bcc32f
Fix GUI icon bug.
The GUI icon did not display properly but showed up with various distortions.
The reason was the icon mask which hadn't been put to the X server yet when
used.
The icon itself was okay, but is rendered now in a way that doesn't need a
drawable which spares creating a GTK window and destroying it right after.
The locally used GDK variables have been moved inside the function where
they are needed.
Patch with grateful support by Steaphan Greene, sgreene cs.binghamton edu.
This closes Bugzilla #582.
author | ib |
---|---|
date | Tue, 14 Jun 2011 17:51:17 +0000 |
parents | fd60388d370a |
children | 4ba6b8d3197e |
rev | line source |
---|---|
30429
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30166
diff
changeset
|
1 /* |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30166
diff
changeset
|
2 * This file is part of MPlayer. |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30166
diff
changeset
|
3 * |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30166
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30166
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30166
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30166
diff
changeset
|
7 * (at your option) any later version. |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30166
diff
changeset
|
8 * |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30166
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30166
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30166
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30166
diff
changeset
|
12 * GNU General Public License for more details. |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30166
diff
changeset
|
13 * |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30166
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30166
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30166
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30166
diff
changeset
|
17 */ |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30166
diff
changeset
|
18 |
26029 | 19 #ifndef MPLAYER_FMT_CONVERSION_H |
20 #define MPLAYER_FMT_CONVERSION_H | |
24156 | 21 |
30166
1d39794263eb
Add missing header #includes to fix 'make checkheaders'.
diego
parents:
28526
diff
changeset
|
22 #include "config.h" |
26069
1318e956c092
FFmpeg now uses different (unified) #include paths.
diego
parents:
26029
diff
changeset
|
23 #include "libavutil/avutil.h" |
32905
fd60388d370a
Add conversion functions to and from AVSampleFormat.
reimar
parents:
30429
diff
changeset
|
24 #include "libavutil/samplefmt.h" |
19872 | 25 |
28526
21efa4282730
Create a fmt-conversion.c file so fmt-conversion.h can be included by multiple files.
reimar
parents:
27601
diff
changeset
|
26 enum PixelFormat imgfmt2pixfmt(int fmt); |
21efa4282730
Create a fmt-conversion.c file so fmt-conversion.h can be included by multiple files.
reimar
parents:
27601
diff
changeset
|
27 int pixfmt2imgfmt(enum PixelFormat pix_fmt); |
32905
fd60388d370a
Add conversion functions to and from AVSampleFormat.
reimar
parents:
30429
diff
changeset
|
28 enum AVSampleFormat affmt2samplefmt(int fmt); |
fd60388d370a
Add conversion functions to and from AVSampleFormat.
reimar
parents:
30429
diff
changeset
|
29 int samplefmt2affmt(enum AVSampleFormat sample_fmt); |
24156 | 30 |
26029 | 31 #endif /* MPLAYER_FMT_CONVERSION_H */ |