Mercurial > mplayer.hg
annotate libmpcodecs/ae_faac.h @ 36304:6f0ab9dd1429
Fix definition of sh->original_aspect.
Since 0 is a valid aspect ratio,
initialization must be different.
This has been a bug in r36391.
author | ib |
---|---|
date | Sun, 04 Aug 2013 18:12:24 +0000 |
parents | 3afcf20a13e4 |
children |
rev | line source |
---|---|
30421
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26147
diff
changeset
|
1 /* |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26147
diff
changeset
|
2 * This file is part of MPlayer. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26147
diff
changeset
|
3 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26147
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26147
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26147
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26147
diff
changeset
|
7 * (at your option) any later version. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26147
diff
changeset
|
8 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26147
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26147
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26147
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26147
diff
changeset
|
12 * GNU General Public License for more details. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26147
diff
changeset
|
13 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26147
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26147
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26147
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26147
diff
changeset
|
17 */ |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
26147
diff
changeset
|
18 |
26029 | 19 #ifndef MPLAYER_AE_FAAC_H |
20 #define MPLAYER_AE_FAAC_H | |
15259 | 21 |
31438
3afcf20a13e4
Move faac/lame/toolame/twolame option array declarations to appropriate headers.
diego
parents:
30421
diff
changeset
|
22 #include "libmpdemux/muxer.h" |
15259 | 23 #include "ae.h" |
31438
3afcf20a13e4
Move faac/lame/toolame/twolame option array declarations to appropriate headers.
diego
parents:
30421
diff
changeset
|
24 #include "m_option.h" |
3afcf20a13e4
Move faac/lame/toolame/twolame option array declarations to appropriate headers.
diego
parents:
30421
diff
changeset
|
25 |
3afcf20a13e4
Move faac/lame/toolame/twolame option array declarations to appropriate headers.
diego
parents:
30421
diff
changeset
|
26 extern const m_option_t faacopts_conf[]; |
15259 | 27 |
28 int mpae_init_faac(audio_encoder_t *encoder); | |
29 | |
26029 | 30 #endif /* MPLAYER_AE_FAAC_H */ |