|
Lines 873-880
Link Here
|
| 873 |
if (!faacEncSetConfiguration(hEncoder, myFormat)) { |
873 |
if (!faacEncSetConfiguration(hEncoder, myFormat)) { |
| 874 |
fprintf(stderr, "Unsupported output format!\n"); |
874 |
fprintf(stderr, "Unsupported output format!\n"); |
| 875 |
#ifdef HAVE_LIBMP4V2 |
875 |
#ifdef HAVE_LIBMP4V2 |
|
|
876 |
/* r479 fix */ |
| 877 |
#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE |
| 878 |
if (container == MP4_CONTAINER) MP4Close(MP4hFile, 0); |
| 879 |
#else |
| 876 |
if (container == MP4_CONTAINER) MP4Close(MP4hFile); |
880 |
if (container == MP4_CONTAINER) MP4Close(MP4hFile); |
| 877 |
#endif |
881 |
#endif |
|
|
882 |
#endif |
| 878 |
return 1; |
883 |
return 1; |
| 879 |
} |
884 |
} |
| 880 |
|
885 |
|
|
Lines 885-896
Link Here
|
| 885 |
unsigned long ASCLength = 0; |
890 |
unsigned long ASCLength = 0; |
| 886 |
char *version_string; |
891 |
char *version_string; |
| 887 |
|
892 |
|
| 888 |
#ifdef MP4_CREATE_EXTENSIBLE_FORMAT |
893 |
#ifdef MP4_DETAILS_ERROR |
| 889 |
/* hack to compile against libmp4v2 >= 1.0RC3 |
894 |
/* r453 fix */ |
| 890 |
* why is there no version identifier in mp4.h? */ |
|
|
| 891 |
MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0); |
895 |
MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0); |
| 892 |
#else |
896 |
#else |
| 893 |
MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0, 0); |
897 |
MP4hFile = MP4Create(aacFileName, 0); |
| 894 |
#endif |
898 |
#endif |
| 895 |
if (!MP4_IS_VALID_FILE_HANDLE(MP4hFile)) { |
899 |
if (!MP4_IS_VALID_FILE_HANDLE(MP4hFile)) { |
| 896 |
fprintf(stderr, "Couldn't create output file %s\n", aacFileName); |
900 |
fprintf(stderr, "Couldn't create output file %s\n", aacFileName); |
|
Lines 1141-1151
Link Here
|
| 1141 |
/* clean up */ |
1145 |
/* clean up */ |
| 1142 |
if (container == MP4_CONTAINER) |
1146 |
if (container == MP4_CONTAINER) |
| 1143 |
{ |
1147 |
{ |
|
|
1148 |
#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE |
| 1149 |
/* r479 fix */ |
| 1150 |
MP4Close(MP4hFile, 0); |
| 1151 |
#else |
| 1144 |
MP4Close(MP4hFile); |
1152 |
MP4Close(MP4hFile); |
|
|
1153 |
#endif |
| 1145 |
if (optimizeFlag == 1) |
1154 |
if (optimizeFlag == 1) |
| 1146 |
{ |
1155 |
{ |
| 1147 |
fprintf(stderr, "\n\nMP4 format optimization... "); |
1156 |
fprintf(stderr, "\n\nMP4 format optimization... "); |
|
|
1157 |
#ifdef MP4_DETAILS_ERROR |
| 1158 |
/* r453 fix */ |
| 1148 |
MP4Optimize(aacFileName, NULL, 0); |
1159 |
MP4Optimize(aacFileName, NULL, 0); |
|
|
1160 |
#else |
| 1161 |
MP4Optimize(aacFileName, NULL); |
| 1162 |
#endif |
| 1149 |
fprintf(stderr, "Done!"); |
1163 |
fprintf(stderr, "Done!"); |
| 1150 |
} |
1164 |
} |
| 1151 |
} else |
1165 |
} else |
