Changeset 6b9308c8f6a66a2f10f1a201490b0be396f2bbfd
- Timestamp:
- 05/01/07 11:32:23
(2 years ago)
- Author:
- Rémi Denis-Courmont <rem@videolan.org>
- git-committer:
- Rémi Denis-Courmont <rem@videolan.org> 1167993143 +0000
- git-parent:
[4e7bb159885c7dcb2f4c7e8559ae545067bd8847]
- git-author:
- Rémi Denis-Courmont <rem@videolan.org> 1167993143 +0000
- Message:
Be more DSO-friendly
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| rd3fe7f2 |
r6b9308c |
|
| 81 | 81 | * - wav can't be added 'cause of a52 and dts in them as raw audio |
|---|
| 82 | 82 | */ |
|---|
| 83 | | static struct { const char *ext; const char *demux; } exttodemux[] = |
|---|
| | 83 | static const struct { char ext[5]; char demux[9]; } exttodemux[] = |
|---|
| 84 | 84 | { |
|---|
| 85 | 85 | { "aac", "aac" }, |
|---|
| … | … | |
| 100 | 100 | { "m4v", "m4v" }, |
|---|
| 101 | 101 | { "h264", "h264" }, |
|---|
| 102 | | { NULL, NULL }, |
|---|
| | 102 | { "", "" }, |
|---|
| 103 | 103 | }; |
|---|
| 104 | 104 | /* Here, we don't mind if it does not work, it must be quick */ |
|---|
| 105 | | static struct { const char *ext; const char *demux; } exttodemux_quick[] = |
|---|
| | 105 | static const struct { char ext[4]; char demux[5]; } exttodemux_quick[] = |
|---|
| 106 | 106 | { |
|---|
| 107 | 107 | { "mp3", "mpga" }, |
|---|
| 108 | 108 | { "ogg", "ogg" }, |
|---|
| 109 | 109 | { "wma", "asf" }, |
|---|
| 110 | | { NULL, NULL } |
|---|
| | 110 | { "", "" } |
|---|
| 111 | 111 | }; |
|---|
| 112 | 112 | |
|---|
| … | … | |
| 116 | 116 | if( !b_quick ) |
|---|
| 117 | 117 | { |
|---|
| 118 | | for( i = 0; exttodemux[i].ext != NULL; i++ ) |
|---|
| | 118 | for( i = 0; exttodemux[i].ext[0]; i++ ) |
|---|
| 119 | 119 | { |
|---|
| 120 | 120 | if( !strcasecmp( psz_ext, exttodemux[i].ext ) ) |
|---|
| … | … | |
| 127 | 127 | else |
|---|
| 128 | 128 | { |
|---|
| 129 | | for( i = 0; exttodemux_quick[i].ext != NULL; i++ ) |
|---|
| | 129 | for( i = 0; exttodemux_quick[i].ext[0]; i++ ) |
|---|
| 130 | 130 | { |
|---|
| 131 | 131 | if( !strcasecmp( psz_ext, exttodemux_quick[i].ext ) ) |
|---|